ANSIfy

1 files changed, 96 insertions, 118 deletions

diff --git a/tools/man2tcl.c b/tools/man2tcl.c
index b2de3fe..aa8dfbc 100644
--- a/tools/man2tcl.c
+++ b/tools/man2tcl.c
@@ -1,11 +1,10 @@
-/* 
+/*
  * man2tcl.c --
  *
- *	This file contains a program that turns a man page of the
- *	form used for Tcl and Tk into a Tcl script that invokes
- *	a Tcl command for each construct in the man page.  The
- *	script can then be eval'ed to translate the manual entry
- *	into some other format such as MIF or HTML.
+ *	This file contains a program that turns a man page of the form used
+ *	for Tcl and Tk into a Tcl script that invokes a Tcl command for each
+ *	construct in the man page. The script can then be eval'ed to translate
+ *	the manual entry into some other format such as MIF or HTML.
  *
  * Usage:
  *
@@ -13,10 +12,10 @@
  *
  * Copyright (c) 1995 Sun Microsystems, Inc.
  *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: man2tcl.c,v 1.9 2005/10/13 18:30:09 dgp Exp $
+ * RCS: @(#) $Id: man2tcl.c,v 1.10 2005/11/04 00:06:49 dkf Exp $
  */
 
 static char sccsid[] = "@(#) man2tcl.c 1.3 95/08/12 17:34:08";
@@ -31,10 +30,10 @@ static char sccsid[] = "@(#) man2tcl.c 1.3 95/08/12 17:34:08";
  */
 
 /*
- * Some <errno.h> define errno to be something complex and
- * thread-aware; in that case we definitely do not want to declare
- * errno ourselves!
+ * Some <errno.h> define errno to be something complex and thread-aware; in
+ * that case we definitely do not want to declare errno ourselves!
  */
+
 #ifndef errno
 extern int errno;
 #endif
@@ -46,22 +45,25 @@ extern int errno;
 static int lineNumber;
 
 /*
- * The variable below is set to 1 if an error occurs anywhere
- * while reading in the file.
+ * The variable below is set to 1 if an error occurs anywhere while reading in
+ * the file.
  */
 
 static int status;
 
 /*
- * The variable below is set to 1 if output should be generated.
- * If it's 0, it means we're doing a pre-pass to make sure that
- * the file can be properly parsed.
+ * The variable below is set to 1 if output should be generated. If it's 0, it
+ * means we're doing a pre-pass to make sure that the file can be properly
+ * parsed.
  */
 
 static int writeOutput;
 
+#define PRINT(args)	if (writeOutput) { printf args; }
+#define PRINTC(chr)	if (writeOutput) { putc((chr), stdout); }
+
 /*
- * Prototypes for procedures defined in this file:
+ * Prototypes for functions defined in this file:
  */
 
 static void		DoMacro(char *line);
@@ -73,24 +75,24 @@ static void		QuoteText(char *string, int count);
  *
  * main --
  *
- *	This procedure is the main program, which does all of the work
- *	of the program.
+ *	This function is the main program, which does all of the work of the
+ *	program.
  *
  * Results:
- *	None: exits with a 0 return status to indicate success, or
- *	1 to indicate that there were problems in the translation.
+ *	None: exits with a 0 return status to indicate success, or 1 to
+ *	indicate that there were problems in the translation.
  *
  * Side effects:
- *	A Tcl script is output to standard output.  Error messages may
- *	be output on standard error.
+ *	A Tcl script is output to standard output. Error messages may be
+ *	output on standard error.
  *
  *----------------------------------------------------------------------
  */
 
 int
-main(argc, argv)
-    int argc;			/* Number of command-line arguments. */
-    char **argv;		/* Values of command-line arguments. */
+main(
+    int argc,			/* Number of command-line arguments. */
+    char **argv)		/* Values of command-line arguments. */
 {
     FILE *f;
 #define MAX_LINE_SIZE 1000
@@ -115,10 +117,10 @@ main(argc, argv)
     }
 
     /*
-     * Make two passes over the file.  In the first pass, just check
-     * to make sure we can handle everything.  If there are problems,
-     * generate output and stop.  If everything is OK, make a second
-     * pass to actually generate output.
+     * Make two passes over the file. In the first pass, just check to make
+     * sure we can handle everything. If there are problems, generate output
+     * and stop. If everything is OK, make a second pass to actually generate
+     * output.
      */
 
     for (writeOutput = 0; writeOutput < 2; writeOutput++) {
@@ -132,15 +134,15 @@ main(argc, argv)
 		}
 	    }
 	    lineNumber++;
-    
+
 	    if ((line[0] == '\'') && (line[1] == '\\') && (line[2] == '\"')) {
-		/* 
-		 * This line is a comment.  Ignore it.
+		/*
+		 * This line is a comment. Ignore it.
 		 */
-    
+
 		continue;
 	    }
-    
+
 	    if (strlen(line) >= MAX_LINE_SIZE -1) {
 		fprintf(stderr, "Too long line. Max is %d chars.\n",
 			MAX_LINE_SIZE - 1);
@@ -151,14 +153,14 @@ main(argc, argv)
 		/*
 		 * This line is a macro invocation.
 		 */
-    
+
 		DoMacro(line);
 	    } else {
 		/*
 		 * This line is text, possibly with formatting characters
 		 * embedded in it.
 		 */
-    
+
 		DoText(line);
 	    }
 	}
@@ -175,9 +177,9 @@ main(argc, argv)
  *
  * DoMacro --
  *
- *	This procedure is called to handle a macro invocation.
- *	It parses the arguments to the macro and generates a
- *	Tcl command to handle the invocation.
+ *	This function is called to handle a macro invocation. It parses the
+ *	arguments to the macro and generates a Tcl command to handle the
+ *	invocation.
  *
  * Results:
  *	None.
@@ -189,9 +191,9 @@ main(argc, argv)
  */
 
 static void
-DoMacro(line)
-    char *line;			/* The line of text that contains the
-				 * macro invocation. */
+DoMacro(
+    char *line)			/* The line of text that contains the macro
+				 * invocation. */
 {
     char *p, *end;
 
@@ -203,13 +205,9 @@ DoMacro(line)
 	return;
     }
 
-    if (writeOutput) {
-	printf("macro");
-    }
+    PRINT(("macro"));
     if (*line != '.') {
-	if (writeOutput) {
-	    printf("2");
-	}
+	PRINT(("2"));
     }
 
     /*
@@ -218,10 +216,8 @@ DoMacro(line)
 
     p = line+1;
     while (1) {
-	if (writeOutput) {
-	    putc(' ', stdout);
-	}
-	if (*p == '"')  {
+	PRINTC(' ');
+	if (*p == '"') {
 	    /*
 	     * The argument is delimited by quotes.
 	     */
@@ -229,15 +225,15 @@ DoMacro(line)
 	    for (end = p+1; *end != '"'; end++) {
 		if (*end == 0) {
 		    fprintf(stderr,
-			"Unclosed quote in macro call on line %d.\n",
-			lineNumber);
+			    "Unclosed quote in macro call on line %d.\n",
+			    lineNumber);
 		    status = 1;
 		    break;
 		}
 	    }
 	    QuoteText(p+1, (end-(p+1)));
 	} else {
-	    for (end = p+1;  (*end != 0) && !isspace(*end); end++) {
+	    for (end = p+1; (*end != 0) && !isspace(*end); end++) {
 		/* Empty loop body. */
 	    }
 	    QuoteText(p, end-p);
@@ -257,9 +253,7 @@ DoMacro(line)
 	    break;
 	}
     }
-    if (writeOutput) {
-	putc('\n', stdout);
-    }
+    PRINTC('\n');
 }
 
 /*
@@ -267,9 +261,9 @@ DoMacro(line)
  *
  * DoText --
  *
- *	This procedure is called to handle a line of troff text.
- *	It parses the text, generating Tcl commands for text and
- *	for formatting stuff such as font changes.
+ *	This function is called to handle a line of troff text. It parses the
+ *	text, generating Tcl commands for text and for formatting stuff such
+ *	as font changes.
  *
  * Results:
  *	None.
@@ -281,22 +275,20 @@ DoMacro(line)
  */
 
 static void
-DoText(line)
-    char *line;			/* The line of text. */
+DoText(
+    char *line)			/* The line of text. */
 {
     char *p, *end;
 
     /*
-     * Divide the line up into pieces consisting of backslash sequences,
-     * tabs, and other text.
+     * Divide the line up into pieces consisting of backslash sequences, tabs,
+     * and other text.
      */
 
     p = line;
     while (*p != 0) {
 	if (*p == '\t') {
-	    if (writeOutput) {
-		printf("tab\n");
-	    }
+	    PRINT(("tab\n"));
 	    p++;
 	} else if (*p != '\\') {
 	    /*
@@ -306,19 +298,15 @@ DoText(line)
 	    for (end = p+1; (*end != '\\') && (*end != 0); end++) {
 		/* Empty loop body. */
 	    }
-	    if (writeOutput) {
-		printf("text ");
-	    }
+	    PRINT(("text "));
 	    QuoteText(p, end-p);
-	    if (writeOutput) {
-		putc('\n', stdout);
-	    }
+	    PRINTC('\n');
 	    p = end;
 	} else {
 	    /*
-	     * A backslash sequence.  There are particular ones
-	     * that we understand;  output an error message for
-	     * anything else and just ignore the backslash.
+	     * A backslash sequence. There are particular ones that we
+	     * understand; output an error message for anything else and just
+	     * ignore the backslash.
 	     */
 
 	    p++;
@@ -327,24 +315,16 @@ DoText(line)
 		 * Font change.
 		 */
 
-		if (writeOutput) {
-		    printf("font %c\n", p[1]);
-		}
+		PRINT(("font %c\n", p[1]));
 		p += 2;
 	    } else if (*p == '-') {
-		if (writeOutput) {
-		    printf("dash\n");
-		}
+		PRINT(("dash\n"));
 		p++;
 	    } else if (*p == 'e') {
-		if (writeOutput) {
-		    printf("text \\\\\n");
-		}
+		PRINT(("text \\\\\n"));
 		p++;
 	    } else if (*p == '.') {
-		if (writeOutput) {
-		    printf("text .\n");
-		}
+		PRINT(("text .\n"));
 		p++;
 	    } else if (*p == '&') {
 		p++;
@@ -354,22 +334,16 @@ DoText(line)
 			    lineNumber);
 		    status = 1;
 		} else {
-		    if (writeOutput) {
-			printf("char {\\(%c%c}\n", p[1], p[2]);
-		    }
+		    PRINT(("char {\\(%c%c}\n", p[1], p[2]));
 		    p += 3;
 		}
 	    } else if (*p != 0) {
-		if (writeOutput) {
-		    printf("char {\\%c}\n", *p);
-		}
+		PRINT(("char {\\%c}\n", *p));
 		p++;
 	    }
 	}
     }
-    if (writeOutput) {
-	printf("newline\n");
-    }
+    PRINT(("newline\n"));
 }
 
 /*
@@ -377,9 +351,9 @@ DoText(line)
  *
  * QuoteText --
  *
- *	Copy the "string" argument to stdout, adding quote characters
- *	around any special Tcl characters so that they'll just be treated
- *	as ordinary text.
+ *	Copy the "string" argument to stdout, adding quote characters around
+ *	any special Tcl characters so that they'll just be treated as ordinary
+ *	text.
  *
  * Results:
  *	None.
@@ -391,26 +365,30 @@ DoText(line)
  */
 
 static void
-QuoteText(string, count)
-    char *string;		/* The line of text. */
-    int count;			/* Number of characters to write from string. */
+QuoteText(
+    char *string,		/* The line of text. */
+    int count)			/* Number of characters to write from
+				 * string. */
 {
     if (count == 0) {
-	if (writeOutput) {
-	    printf("{}");
-	}
+	PRINT(("{}"));
 	return;
     }
     for ( ; count > 0; string++, count--) {
-	if ((*string == '$') || (*string == '[') || (*string == '{')
-		|| (*string == ' ') || (*string == ';') || (*string == '\\')
-		|| (*string == '"') || (*string == '\t')) {
-	    if (writeOutput) {
-		putc('\\', stdout);
-	    }
-	}
-	if (writeOutput) {
-	    putc(*string, stdout);
+	switch (*string) {
+	case '$': case '[': case '{': case ' ': case ';': case '\\':
+	case '"': case '\t':
+	    PRINTC('\\');
+	default:
+	    PRINTC(*string);
 	}
     }
 }
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */