* Use bdlib for makehelp

lib/bdlib

@@ -1 +1 @@
-Subproject commit 7a7a3b18a3d95930da277acd9b6f14ed9ee91828
+Subproject commit a510eec13f5e72031ed04f908d5d53b8721a962e

src/Makefile.in

@@ -78,9 +78,9 @@ makeset: makeset.c ../lib/bdlib/src/libbdlib.a
 	@$(CXX) $(CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) makeset.c ../lib/bdlib/src/libbdlib.a -o makeset
 	@$(STRIP) makeset@EXEEXT@
 
-makehelp: makehelp.c
+makehelp: makehelp.c ../lib/bdlib/src/libbdlib.a
 	@echo -e "Compiling: \033[1mmakehelp\033[0m"
-	@$(CXX) $(CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) makehelp.c -o makehelp
+	@$(CXX) $(CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) makehelp.c ../lib/bdlib/src/libbdlib.a -o makehelp
 	@$(STRIP) makehelp@EXEEXT@
 
 sorthelp: sorthelp.c

src/makehelp.c

@@ -1,85 +1,12 @@
 
+#include <bdlib/src/String.h>
+#include <bdlib/src/Stream.h>
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
 
-char *replace(char *string, char *oldie, char *newbie)
-{
-  static char newstring[1024] = "";
-  int str_index, newstr_index, oldie_index, end, new_len, old_len, cpy_len;
-  char *c = NULL;
-
-  if (string == NULL) return "";
-  if ((c = (char *) strstr(string, oldie)) == NULL) return string;
-  new_len = strlen(newbie);
-  old_len = strlen(oldie);
-  end = strlen(string) - old_len;
-  oldie_index = c - string;
-  newstr_index = 0;
-  str_index = 0;
-  while(str_index <= end && c != NULL) {
-    cpy_len = oldie_index-str_index;
-    strncpy(newstring + newstr_index, string + str_index, cpy_len);
-    newstr_index += cpy_len;
-    str_index += cpy_len;
-    strcpy(newstring + newstr_index, newbie);
-    newstr_index += new_len;
-    str_index += old_len;
-    if((c = (char *) strstr(string + str_index, oldie)) != NULL)
-     oldie_index = c - string;
-  }
-  strcpy(newstring + newstr_index, string + str_index);
-  return (newstring);
-}
-
-
-char *step_thru_file(FILE *fd)
-{
-  char tempBuf[1024] = "";
-  char *retStr = NULL;
-
-  if (fd == NULL) {
-    return NULL;
-  }
-  retStr = NULL;
-  while (!feof(fd)) {
-    if (fgets(tempBuf, sizeof(tempBuf), fd) && !feof(fd)) {
-      if (retStr == NULL) {
-        retStr = (char *) calloc(1, strlen(tempBuf) + 2);
-        strcpy(retStr, tempBuf);
-      } else {
-        retStr = (char *) realloc(retStr, strlen(retStr) + strlen(tempBuf));
-        strcat(retStr, tempBuf);
-      }
-      if (retStr[strlen(retStr)-1] == '\n') {
-        retStr[strlen(retStr)-1] = 0;
-        break;
-      }
-    }
-  }
-  return retStr;
-}
-
-char *newsplit(char **rest)
-{
-  register char *o, *r;
-
-  if (!rest)
-    return *rest = "";
-  o = *rest;
-  while (*o == ' ')
-    o++;
-  r = o;
-  while (*o && (*o != ' '))
-    o++;
-  if (*o)
-    *o++ = 0;
-  *rest = o;
-  return r;
-}
-
-int skipline (char *line, int *skip) {
+int skipline (const char *line, int *skip) {
   static int multi = 0;
   if ((!strncmp(line, "//", 2))) {
     (*skip)++;
@@ -99,109 +26,76 @@ int skipline (char *line, int *skip) {
 
 #define type(hub, leaf) (hub ? 1 : (leaf ? 2 : 0))
 
-int parse_help(char *infile, char *outfile) {
-  FILE *in = NULL, *out = NULL;
-  char *buffer = NULL, *cmd = NULL;
-  int skip = 0, line = 0, leaf = 0, hub = 0;
+int parse_help(bd::String infile, bd::String outfile) {
+  bd::Stream in, out;
+  bd::String buffer, cmd, buf;
+  size_t pos = 0;
+  int skip = 0, leaf = 0, hub = 0;
 
-  if (!(in = fopen(infile, "r"))) {
-    printf("Error: Cannot open '%s' for reading\n", infile);
-    return 1;
-  }
-  if (!(out = fopen(outfile, "w"))) {
-    printf("Error: Cannot open '%s' for writing\n", outfile);
-    return 1;
-  }
-  printf("Parsing help file '%s'", infile);
-  fprintf(out, "/* DO NOT EDIT THIS FILE, EDIT doc/help.txt INSTEAD */\n#ifndef HELP_H\n\
+  in.loadFile(infile);
+  printf("Parsing help file '%s'", infile.c_str());
+  out <<  buf.printf("/* DO NOT EDIT THIS FILE, EDIT doc/help.txt INSTEAD */\n#ifndef HELP_H\n\
 #define HELP_H\n\
-#define STR(x) x\n\
 #include \"cmds.h\"\n\
 \n\
 help_t help[] = \n\
 { \n");
-  while ((!feof(in)) && ((buffer = step_thru_file(in)) != NULL) ) {
-    line++;
-    if ((*buffer)) {
-      if (strchr(buffer, '\n')) *(char*)strchr(buffer, '\n') = 0;
-      if ((skipline(buffer, &skip))) continue;
-      if (buffer[0] == ':') { /* New cmd */
-        char *ifdef = (char *) calloc(1, strlen(buffer) + 1), *p = NULL;
-        int cl = 0, doleaf = 0, dohub = 0;
+  while (in.tell() < in.length()) {
+    buffer = in.getline().chomp();
 
-        buffer++;
-        strcpy(ifdef, buffer);
-        p = strchr(ifdef, ':');
-        *p = 0;
-        if (ifdef && ifdef[0]) {
-          if (!strcasecmp(ifdef, "leaf")) {
-            if (hub) { cl = 1; hub = 0; }
-            if (!leaf) {
-              doleaf = leaf = 1;
-            }
-          } else if (!strcasecmp(ifdef, "hub")) {
-            if (leaf) { cl = 1; hub = 0; }
-            if (!hub) {
-              dohub = hub = 1;
-            }
-          }
-        } else { if (leaf || hub) { cl = 1; } leaf = 0; hub = 0;  }
+    if ((skipline(buffer.c_str(), &skip))) continue;
 
-        if (cmd && cmd[0]) {		/* CLOSE LAST CMD */
-          if (strchr(cmd, ':'))		/* garbled */
-            fprintf(out,"\")},\n");
-          else
-            fprintf(out,"\"},\n");
-//          if (cl) { cl = 0; fprintf(out, "#endif\n"); }
-//          if (dohub) { dohub = 0; fprintf(out, "#ifdef HUB\n"); }
-//          else if (doleaf) { doleaf = 0; fprintf(out, "#ifdef LEAF\n"); }
-          free(cmd);
-        }
-        p = strchr(buffer, ':');
-        p++;
-        if (strcmp(p, "end")) {		/* NEXT CMD */
-          cmd = (char *) calloc(1, strlen(p) + 1);
+    if (buffer[0] == ':') { /* New cmd */
+      bd::String ifdef(buffer.length());
+      int cl = 0, doleaf = 0, dohub = 0;
 
-          strcpy(cmd, p);
-          printf(".");
-//          if (dohub) { dohub = 0; fprintf(out, "#ifdef HUB\n"); }
-//          else if (doleaf) { doleaf = 0; fprintf(out, "#ifdef LEAF\n"); }
-          if (strchr(cmd, ':')) {
-            char *p2 = NULL, *cmdn = (char *) calloc(1,strlen(cmd) + 1);
+      ++buffer;
+      ifdef = newsplit(buffer, ':');
 
-            strcpy(cmdn, cmd);
-            p2 = strchr(cmdn, ':');
-            *p2 = 0;
-            fprintf(out, "  {%d, \"%s\", STR(\"", type(dohub, doleaf), cmdn);
-          } else
-            fprintf(out, "  {%d, \"%s\", 0, \"", type(dohub, doleaf), cmd);
-        } else {			/* END */
-          fprintf(out, "  {0, NULL, 0, NULL}\n};\n");
+      if (ifdef.length()) {
+        if (ifdef == "leaf") {
+          if (hub) { cl = 1; hub = 0; }
+          if (!leaf) {
+            doleaf = leaf = 1;
+          }
+        } else if (ifdef == "hub") {
+          if (leaf) { cl = 1; hub = 0; }
+          if (!hub) {
+            dohub = hub = 1;
+          }
         }
-      } else {				/* CMD HELP INFO */
-        fprintf(out, "%s\\n", replace(buffer, "\"", "\\\""));
+      } else { if (leaf || hub) { cl = 1; } leaf = 0; hub = 0;  }
+
+      if (cmd.length()) {		/* CLOSE LAST CMD */
+        if (cmd.find(':') != bd::String::npos)		/* garbled */
+          out << "\")},\n";
+        else
+          out << "\"},\n";
+        cmd.clear();
+      }
+
+      cmd = newsplit(buffer, ':');
+      if (cmd != "end") {		/* NEXT CMD */
+        printf(".");
+        if ((pos = cmd.find(':')) != bd::String::npos)
+          cmd = cmd(0, pos);
+        out << buf.printf("  {%d, \"%s\", 0, \"", type(dohub, doleaf), cmd.c_str());
+      } else {			/* END */
+        out << "  {0, NULL, 0, NULL}\n};\n";
       }
+    } else {				/* CMD HELP INFO */
+      out << buf.printf("%s\\n", buffer.sub("\"", "\\\"").c_str());
     }
-    buffer = NULL;
   }
-  fprintf(out, "#endif /* HELP_H */\n");
+  out << "#endif /* HELP_H */\n";
   printf(" Success\n");
-  if (in) fclose(in);
-  if (out) fclose(out);
+
+  out.writeFile(outfile);
   return 0;
 }
 
 int main(int argc, char **argv) {
-  char *in = NULL, *out = NULL;
-  int ret = 0;
-
   if (argc < 3) return 1;
-  in = (char *) calloc(1, strlen(argv[1]) + 1);
-  strcpy(in, argv[1]);
-  out = (char *) calloc(1, strlen(argv[2]) + 1);
-  strcpy(out, argv[2]);
-  ret = parse_help(in, out);
-  free(in);
-  free(out);
-  return ret;
+  bd::String in(argv[1]), out(argv[2]);
+  return parse_help(in, out);
 }