[Pinfo-devel] r152 - pinfo/branches/cxx/src

[Nathanael Nerode]

Author: neroden-guest
Date: 2005-09-02 12:01:08 +0000 (Fri, 02 Sep 2005)
New Revision: 152

Modified:
   pinfo/branches/cxx/src/manual.cxx
Log:
Fix link bugs in manual display code (and incidentally simplify the code).


Modified: pinfo/branches/cxx/src/manual.cxx
===================================================================
--- pinfo/branches/cxx/src/manual.cxx	2005-09-02 10:43:26 UTC (rev 151)
+++ pinfo/branches/cxx/src/manual.cxx	2005-09-02 12:01:08 UTC (rev 152)
@@ -114,9 +114,6 @@
 /* a set of manual references of man page */
 vector<manuallink> manuallinks;
 
-/* semaphore for checking if it's a history(left arrow) call */
-int historical = 0;
-
 /* Debugging routine */
 void
 dumplink(manuallink a) {
@@ -350,22 +347,13 @@
 				xfree(tmpfilename2);
 			}
 			tmpfilename2 = tempnam("/tmp", NULL);
-			/*
-			 * key_back is not pressed; and return_value is an offset to
-			 * manuallinks
-			 */
+
+			bool historical = false;
 			string cmd_string = "man ";
 			cmd_string += ManOptions;
 			cmd_string += " ";
-			if (return_value != -2)
-			{
-				construct_manualname(manualname_string, return_value);
-				cmd_string += manuallinks[return_value].section;
-				cmd_string += " ";
-				cmd_string += manualname_string;
-			}
-			else /* key_back was pressed */
-			{
+			if (return_value == -2) {
+				/* key_back was pressed */
 				if ( (manualhistory.size() - 2) == 0 && apropos_tempfilename)
 				{
 					id = fopen(apropos_tempfilename, "r");
@@ -380,13 +368,17 @@
 					cmd_string += " ";
 					cmd_string += manualhistory[manualhistory.size() - 2].name;
 				}
+				manualhistory.pop_back();
+				historical = true;
+			} else {
 				/*
-				 * flag to make sure, that
-				 * manualwork will refresh the variables manualpos and selected
-				 * when going back to this page
+				 * key_back was not pressed; and return_value is an offset to
+				 * manuallinks
 				 */
-				historical = 1;
-				manualhistory.pop_back();
+				construct_manualname(manualname_string, return_value);
+				cmd_string += manuallinks[return_value].section;
+				cmd_string += " ";
+				cmd_string += manualname_string;
 			}
 			cmd_string += " ";
 			cmd_string += StderrRedirection;
@@ -394,8 +386,7 @@
 			cmd_string += tmpfilename2;
 			system(cmd_string.c_str());
 			stat(tmpfilename2, &statbuf);
-			if (statbuf.st_size > 0)
-			{
+			if (statbuf.st_size > 0) {
 				string cmd_string = "mv ";
 				cmd_string += tmpfilename2;
 				cmd_string += " ";
@@ -404,8 +395,7 @@
 				system(cmd_string.c_str());
 				/* open man page */
 				id = fopen(tmpfilename1, "r");
-				if (id != NULL)
-				{
+				if (id != NULL) {
 					manhistory my_hist;
 					/* now we create history entry for new page */
 					if (!historical)
@@ -416,22 +406,16 @@
 						 */
 						my_hist.name = manualname_string;
 						my_hist.sect = manuallinks[return_value].section;
+						my_hist.pos = 0;
+						my_hist.selected = -1;
+						manualhistory.push_back(my_hist);
 					}
 					/* loading manual page and its defaults... */
 					loadmanual(id);
 					fclose(id);
-					/* continuing with creation of history */
-					if (!historical)
-					{
-						my_hist.pos = manualpos;
-						my_hist.selected = selected;
-						manualhistory.push_back(my_hist);
-					}
-					else
-						historical = 0;
-				}
-				else
+				} else {
 					return_value = -1;
+				}
 			}
 		}
 	} while (return_value != -1);
@@ -679,7 +663,8 @@
 									    || (manualhistory[manualhistory.size() - 1].sect == " ")
 						        )
 						   ) {
-							break;
+							link++;
+							continue;
 						}
 					}
 					manuallink my_link;