From: H.G.Muller <hgm@hgm-xboard.(none)>
Date: Tue, 15 Mar 2016 14:15:29 +0000 (+0100)
Subject: Allow access to gzipped man files
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=b30c8555a01a10761ef8d5030223bdd6a1a408c9;p=xboard.git

Allow access to gzipped man files

For *.gz man files we run gunzip to buffer the unzipped version in
memory. For engines this buffer is not saved, because the engine might
change. (A bit course...)
---

diff --git a/dialogs.c b/dialogs.c
index 191061c..4dce7f4 100644
--- a/dialogs.c
+++ b/dialogs.c
@@ -2446,12 +2446,21 @@ DisplayTitle (char *text)
     SetWindowTitle(text, title, icon);
 }
 
+char *textPtr;
+
+int
+GetNext(FILE *f)
+{
+    if(textPtr) return *textPtr ? *textPtr++ : EOF;
+    return fgetc(f);
+}
+
 static char *
 ReadLine (FILE *f)
 {
     static char buf[MSG_SIZ];
     int i = 0, c;
-    while((c = fgetc(f)) != '\n') { if(c == EOF) return NULL; buf[i++] = c; }
+    while((c = GetNext(f)) != '\n') { if(c == EOF) return NULL; buf[i++] = c; }
     buf[i] = NULLCHAR;
     return buf;
 }
@@ -2492,25 +2501,34 @@ GetHelpText (FILE *f, char *name)
 void
 DisplayHelp (char *name)
 {
-    static char *xboardMan;
-    char buf[MSG_SIZ], tidy[MSG_SIZ];
+    static char *xboardMan, *manText[2];
+    char buf[MSG_SIZ], tidy[MSG_SIZ], *eng;
+    int n = 0;
     FILE *f;
     if(!xboardMan) {
 	xboardMan = BufferCommandOutput("man -w xboard", MSG_SIZ); // obtain path to XBoard's man file
 	if(xboardMan) xboardMan[strlen(xboardMan)-1] = NULLCHAR;   // strip off traling linefeed
     }
-    if(currentCps) {
-	TidyProgramName(currentCps == &first ? appData.firstChessProgram : appData.secondChessProgram, "localhost", tidy);
-	snprintf(buf, MSG_SIZ, "/usr/local/share/man/man6/%s.6", tidy);
+    if(currentCps) { // for engine options we have to look in engine manual
+	snprintf(tidy, MSG_SIZ, "man -w ");
+	TidyProgramName(currentCps == &first ? appData.firstChessProgram : appData.secondChessProgram, "localhost", tidy+7);
+	eng = BufferCommandOutput(tidy, MSG_SIZ);
+	safeStrCpy(buf, eng, strlen(eng));
+	FREE(eng);
+	n = 1;
     } else snprintf(buf, MSG_SIZ, "%s", xboardMan);
     f = fopen(buf, "r");
-    if(!f && currentCps) { // engine manual could be in two places
-	snprintf(buf, MSG_SIZ, "/usr/share/man/man6/%s.6", tidy);
-	f = fopen(buf, "r");
-    }
     if(f) {
+	if(strstr(buf, ".gz")) { // man file is gzipped
+	    if(!manText[n]) {    // unzipped text not buffered yet
+		snprintf(tidy, MSG_SIZ, "gunzip -c %s", buf);
+		manText[n] = BufferCommandOutput(tidy, 250000); // store unzipped in buffer
+	    }
+	    textPtr = manText[n];
+	} else textPtr = NULL;
 	GetHelpText(f, name);
 	fclose(f);
+	if(currentCps) free(manText[1]), manText[1] = NULL; // never reuse engine text 
     }
 }