Procházet zdrojové kódy

* Fixed some bugs caused from removing dcc_cmd_t

svn: 216
Bryan Drewery před 22 roky
rodič
revize
b64c3cbdeb
3 změnil soubory, kde provedl 14 přidání a 12 odebrání
  1. 7 6
      src/cmds.c
  2. 7 0
      src/tclhash.c
  3. 0 6
      src/tclhash.h

+ 7 - 6
src/cmds.c

@@ -749,9 +749,13 @@ Context;
     showall = 1;
     build_flags(flg, &fr, NULL);
     dprintf(idx, STR("Showing help topics matching your flags: (%s)\n  "), flg);
+  } else {
+    dprintf(idx, "Not yet implemented.\n");
+    return;
   }
 
-  for (o = 0; o < cmdi; o++) {
+  /* this displays help for old system
+  for (o = 0; o < cmdi; o++) {			
     if (!flagrec_ok(&cmds[o].flags, &fr))
       continue;
     if (!showall && !egg_strcasecmp(par, cmds[o].name)) {
@@ -762,8 +766,9 @@ Context;
       dprintf(idx, STR("Description: %s\n"), cmds[o].desc ? cmds[o].desc : "None");
       break;
     }
+  */
   }
-
+  
   if (showall) {
     qsort(cmds, o, sizeof(mycmds), my_cmp);
     end = 0;
@@ -785,19 +790,15 @@ Context;
             dprintf(idx, "%s\n", buf[0] ? buf : "");
             dprintf(idx, STR("# DCC (%s)\n"), flag);
             sprintf(buf, "  ");
-            /* dprintf(idx, "%s## DCC (%s)\n  ", "\n", flag); */
           }
 
           if (end && !first) {
             dprintf(idx, "%s\n", buf[0] ? buf : "");
             /* we dumped the buf to dprintf, now start a new one... */
             sprintf(buf, "  ");
-            /* snprintf(buf, sizeof buf, "%s\n  ", buf); */
-            /* dprintf(idx, STR("\n  ")); */
           }
         
           sprintf(buf, "%s%-14.14s", buf[0] ? buf : "", cmds[n].name);
-          /* dprintf(idx, STR("%-14.14s"), cmds[n].name); */
           first = 0;
           end = 0;
           i++;

+ 7 - 0
src/tclhash.c

@@ -1166,6 +1166,13 @@ void add_builtins(tcl_bind_list_t *tl, cmd_t *cc)
   table[0].callback = tl->func;
   table[1].name = NULL;
   for (i = 0; cc[i].name; i++) {
+    /* add H_dcc cmds to cmds[] :: add to the help system.. */
+    if (tl == H_dcc) {
+      cmds[cmdi].name = cc[i].name;
+      cmds[cmdi].flags.match = FR_GLOBAL | FR_CHAN;
+      break_down_flags(cc[i].flags, &(cmds[cmdi].flags), NULL);
+      cmdi++;
+    }
     egg_snprintf(p, sizeof p, "*%s:%s", tl->name,
 		   cc[i].funcname ? cc[i].funcname : cc[i].name);
     l = (char *) nmalloc(Tcl_ScanElement(p, &k));

+ 0 - 6
src/tclhash.h

@@ -16,8 +16,6 @@ typedef struct tcl_cmd_b {
   char			*func_name;	/* Proc name.			*/
   int			 hits;		/* Number of times this proc
 					   was triggered.		*/
-  char *usage;
-  char *desc;
   u_8bit_t		 attributes;	/* Flags for this entry. TC_*	*/
 } tcl_cmd_t;
 
@@ -27,8 +25,6 @@ typedef struct tcl_cmd_b {
 typedef struct tct {
   struct flag_record flags;
   void *func;
-  char *usage;
-  char *desc;
   struct tct *next;
 } bind_cmd_t;
 
@@ -50,8 +46,6 @@ typedef struct tcl_bind_mask_b {
 typedef struct {
  char *name;
  struct flag_record     flags;
- char *desc;
- char *usage;
 } mycmds;
 
 typedef struct tcl_bind_list_b {