Changeset bb9659 in git

Timestamp:

Jul 21, 2014, 11:16:26 AM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

638c230a7830a70d265a617a0f2f2fa0505f2ec0

Parents:

31d40c145242ddd7da4100d5cad7ccb19297b6ad

Message:

fix: help: builtin, info

File:

• Singular/fehelp.cc (modified) (6 diffs)

Singular/fehelp.cc

@@ -501 +501 @@
         }
         if (c == EOF) goto Failure;
+        if (hentry->node[0]=='\0')
+          strcpy(hentry->node,hentry->key);
 
         // get url
-        hentry->node[i] = '\0';
+        //hentry->node[i] = '\0';
         i = 0;
         while ((c = getc(fd)) != '\t' && c != EOF)
@@ -1145 +1147 @@
   Warn("information on Singular running under Emacs, type C-h m.");
 }
-static int singular_manual(char *str);
+static int singular_manual(char *str, BOOLEAN isIndexEntry);
 static void heBuiltinHelp(heEntry hentry, int /*br*/)
 {
-  char* node = omStrDup(hentry != NULL && *(hentry->node) != '\0' ?
-                       hentry->node : "Top");
-  singular_manual(node);
+  char* node = omStrDup(hentry != NULL && *(hentry->key) != '\0' ?
+                       hentry->key : "Top");
+  singular_manual(node,(hentry != NULL) && (hentry->url!=NULL));
   omFree(node);
 }
@@ -1214 +1216 @@
 
 /*************************************************/
-static int singular_manual(char *str)
+static int singular_manual(char *str, BOOLEAN isIndexEntry)
 { FILE *index=NULL;
   unsigned long offset;
@@ -1229 +1231 @@
   }
 
-  for(p=str; *p; p++) *p = tolow(*p);/* */
-  do
-  {
-    p--;
-  }
-  while ((p != str) && (*p<=' '));
-  p++;
-  *p='\0';
-  (void)sprintf(String, " %s ", str);
+  if (!isIndexEntry)
+  {
+    for(p=str; *p; p++) *p = tolow(*p);/* */
+    do
+    {
+      p--;
+    }
+    while ((p != str) && (*p<=' '));
+    p++;
+    *p='\0';
+    (void)sprintf(String, " %s ", str);
+  }
+  else
+  {
+    (void)sprintf(String, " %s", str);
+  }
 
   while(!feof(index)
@@ -1245 +1254 @@
   while(!feof(index))
   {
-    // char* dummy=fgets(buffer, BUF_LEN, index); /* */
-    (void)si_sscanf(buffer, "Node:%[^\177]\177%ld\n", Index, &offset);
-    for(p=Index; *p; p++) *p = tolow(*p);/* */
-    (void)strcat(Index, " ");
-    if( strstr(Index, String)!=NULL)
+    if (fgets(buffer, BUF_LEN, index)==NULL) break; /*fill buffer */
+    if (si_sscanf(buffer, "Node:%[^\177]\177%ld\n", Index, &offset)!=2)
+      continue;
+    if (!isIndexEntry)
+    {
+      for(p=Index; *p; p++) *p = tolow(*p);/* */
+      (void)strcat(Index, " ");
+      if( strstr(Index, String)!=NULL)
+      {
+        done++; (void)show(offset, &close);
+      }
+    }
+    else if( strcmp(Index, String)==0)
     {
       done++; (void)show(offset, &close);
+      break;
     }
     Index[0]='\0';
@@ -1258 +1276 @@
   }
   if (index != NULL) (void)fclose(index);
-  if(! done)
+  if(done==0)
   {
     Warn("`%s` not found",String);