Changeset 69331f in git for Singular/fehelp.cc

Timestamp:

Feb 25, 2009, 6:36:32 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

3060a73242c56484e4c175cb564cf06f7a959d2e

Parents:

14db39c727ddf950b7c8c1919e53b77d77771923

Message:

*hannes: builtin help browser: ticket 86


git-svn-id: file:///usr/local/Singular/svn/trunk@11469 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

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

Singular/fehelp.cc

@@ -4 +4 @@
 /*
 * ABSTRACT: help system
-* versin $Id: fehelp.cc,v 1.54 2008-09-25 10:20:37 Singular Exp $
+* versin $Id: fehelp.cc,v 1.55 2009-02-25 17:36:32 Singular Exp $
 */
 
@@ -127 +127 @@
   BOOLEAN key_is_regexp = (strchr(str, '*') != NULL);
   heEntry_s hentry;
+  memset(&hentry,0,sizeof(hentry));
   char* idxfile = feResource('x' /*"IdxFile"*/);
 
   // Try exact match of help string with key in index
-  if (!key_is_regexp && idxfile != NULL && heKey2Entry(idxfile, str, &hentry))
+  if (!key_is_regexp && (idxfile != NULL) && heKey2Entry(idxfile, str, &hentry))
   {
     heBrowserHelp(&hentry);
@@ -860 +861 @@
   {
     Warn("Displaying help in browser '%s'.", heCurrentHelpBrowser->browser);
-    if (strcmp(heCurrentHelpBrowser->browser, "netscape") == 0 &&
-        feResource('h', 0) == NULL)
-    {
-      Warn("Using URL '%s'.", feResource('u', 0));
-    }
+    //if (strcmp(heCurrentHelpBrowser->browser, "netscape") == 0 &&
+    //    feResource('h', 0) == NULL)
+    //{
+    //  Warn("Using URL '%s'.", feResource('u', 0));
+    //}
     Warn("Use 'system(\"--browser\", <browser>);' to change browser,");
     char* browsers = StringSetS("where <browser> can be: ");
@@ -891 +892 @@
 {
   if (heHelpBrowsers[br].required==NULL) return TRUE;
+  Print("req:%s\n",heHelpBrowsers[br].required);
   const char *p=heHelpBrowsers[br].required;
   while (*p>'\0')
@@ -1164 +1166 @@
 
 /*************************************************/
-static int show(unsigned long offset,FILE *help, char *close)
+static int show(unsigned long offset, char *close)
 { char buffer[BUF_LEN+1];
   int  lines = 0;
-
-  if( help== NULL)
-    if( (help = fopen(feResource('i'), "rb")) == NULL)
-      return HELP_NOT_OPEN;
+  FILE * help;
+
+  if( (help = fopen(feResource('i'), "rb")) == NULL)
+    return HELP_NOT_OPEN;
 
   fseek(help,  (long)(offset+1), (int)0);
-  while( !feof(help)
-        && *fgets(buffer, BUF_LEN, help) != EOF
-        && buffer[0] != FIN_INDEX)
+  while( (!feof(help))
+        && (*fgets(buffer, BUF_LEN, help) != EOF)
+        && (buffer[0] != FIN_INDEX))
   {
     printf("%s", buffer);
@@ -1199 +1201 @@
       getchar();
   }
+  fclose(help);
   return HELP_OK;
 }
@@ -1204 +1207 @@
 /*************************************************/
 static int singular_manual(char *str)
-{ FILE *index=NULL,*help=NULL;
+{ FILE *index=NULL;
   unsigned long offset;
   char *p,close;
@@ -1211 +1214 @@
        Index[IDX_LEN+1],
        String[IDX_LEN+1];
+  Print("HELP >>%s>>\n",str);
 
   if( (index = fopen(feResource('i'), "rb")) == NULL)
@@ -1228 +1232 @@
 
   while(!feof(index)
-        && fgets(buffer, BUF_LEN, index) != (char *)0
-        && buffer[0] != FIN_INDEX);
+        && (fgets(buffer, BUF_LEN, index) != (char *)0)
+        && (buffer[0] != FIN_INDEX));
 
   while(!feof(index))
@@ -1239 +1243 @@
     if( strstr(Index, String)!=NULL)
     {
-      done++; (void)show(offset, help, &close);
+      done++; (void)show(offset, &close);
     }
     Index[0]='\0';
@@ -1246 +1250 @@
   }
   if (index != NULL) (void)fclose(index);
-  if (help != NULL) (void)fclose(help);
   if(! done)
   {