From: Tom Tromey <tromey@redhat.com>
Date: Mon, 23 Mar 1998 14:57:02 +0000 (+0000)
Subject: new version of ansi2knr
X-Git-Tag: Release-1-2h~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54518e397876926199ac9671c699d10dc93728aa;p=thirdparty%2Fautomake.git

new version of ansi2knr
---

diff --git a/ChangeLog b/ChangeLog
index 0ca495316..325ffcaed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 23 07:55:04 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* ansi2knr.c, ansi2knr.1: New versions from ghostscript.
+	(main): Reapplied "-" change from Harlan Stenn.
+
 Fri Mar 20 22:42:30 1998  Tom Tromey  <tromey@cygnus.com>
 
 	* automake.in (scan_one_configure_file): Use &am_conf_line_error,
diff --git a/ansi2knr.c b/ansi2knr.c
index f7d5cc339..791eee04c 100644
--- a/ansi2knr.c
+++ b/ansi2knr.c
@@ -184,7 +184,7 @@ main(argc, argv)
 	 */
 	int convert_varargs = 1;
 
-	if ( argc > 1 && argv[1][0] == '-'  && argv[1][1])
+	if ( argc > 1 && argv[1][0] == '-' && argv[1][1] )
 	  {	if ( !strcmp(argv[1], "--varargs") )
 		  {	convert_varargs = 1;
 			argc--;
@@ -195,33 +195,29 @@ main(argc, argv)
 			exit(1);
 		  }
 	  }
-	if (argc < 2 || argc > 3)
+	switch ( argc )
 	   {
+	default:
 		printf("Usage: ansi2knr input_file [output_file]\n");
+		exit(0);
+	case 2:
+		out = stdout;
+		break;
+	case 3:
+		out = fopen(argv[2], "w");
+		if ( out == NULL )
+		   {	fprintf(stderr, "Cannot open output file %s\n", argv[2]);
 			exit(1);
 		   }
-	if (argv[1][0] == '-' && !argv[1][1])
-	  in = stdin;
+	   }
+	if ( argv[1][0] == '-' && !argv[1][1] )
+	   in = stdin;
 	else
-	  in = fopen(argv[1], "r");
+	   in = fopen(argv[1], "r");
 	if ( in == NULL )
-	  {
-	    fprintf(stderr, "Cannot open input file %s\n", argv[1]);
+	   {	fprintf(stderr, "Cannot open input file %s\n", argv[1]);
 		exit(1);
 	   }
- 	if (argc == 3)
- 	  {
- 	    out = fopen(argv[2], "w");
- 	    if ( out == NULL )
- 	      {
- 		fprintf(stderr, "Cannot open output file %s\n", argv[2]);
- 		exit(1);
- 	      }
- 	  }
- 	else
- 	  {
- 	    out = stdout;
- 	  }
 	fprintf(out, "#line 1 \"%s\"\n", argv[1]);
 	buf = malloc(bufsize);
 	line = buf;
diff --git a/lib/ansi2knr.c b/lib/ansi2knr.c
index f7d5cc339..791eee04c 100644
--- a/lib/ansi2knr.c
+++ b/lib/ansi2knr.c
@@ -184,7 +184,7 @@ main(argc, argv)
 	 */
 	int convert_varargs = 1;
 
-	if ( argc > 1 && argv[1][0] == '-'  && argv[1][1])
+	if ( argc > 1 && argv[1][0] == '-' && argv[1][1] )
 	  {	if ( !strcmp(argv[1], "--varargs") )
 		  {	convert_varargs = 1;
 			argc--;
@@ -195,33 +195,29 @@ main(argc, argv)
 			exit(1);
 		  }
 	  }
-	if (argc < 2 || argc > 3)
+	switch ( argc )
 	   {
+	default:
 		printf("Usage: ansi2knr input_file [output_file]\n");
+		exit(0);
+	case 2:
+		out = stdout;
+		break;
+	case 3:
+		out = fopen(argv[2], "w");
+		if ( out == NULL )
+		   {	fprintf(stderr, "Cannot open output file %s\n", argv[2]);
 			exit(1);
 		   }
-	if (argv[1][0] == '-' && !argv[1][1])
-	  in = stdin;
+	   }
+	if ( argv[1][0] == '-' && !argv[1][1] )
+	   in = stdin;
 	else
-	  in = fopen(argv[1], "r");
+	   in = fopen(argv[1], "r");
 	if ( in == NULL )
-	  {
-	    fprintf(stderr, "Cannot open input file %s\n", argv[1]);
+	   {	fprintf(stderr, "Cannot open input file %s\n", argv[1]);
 		exit(1);
 	   }
- 	if (argc == 3)
- 	  {
- 	    out = fopen(argv[2], "w");
- 	    if ( out == NULL )
- 	      {
- 		fprintf(stderr, "Cannot open output file %s\n", argv[2]);
- 		exit(1);
- 	      }
- 	  }
- 	else
- 	  {
- 	    out = stdout;
- 	  }
 	fprintf(out, "#line 1 \"%s\"\n", argv[1]);
 	buf = malloc(bufsize);
 	line = buf;