svn commit: r209576 - stable/8/bin/pax

[Xin LI]

Author: delphij
Date: Mon Jun 28 17:06:19 2010
New Revision: 209576
URL: http://svn.freebsd.org/changeset/base/209576

Log:
  MFC r205942:
  
  Merge OpenBSD revisions 1.4 through 1.9, mostly style cleanups.
  
  Obtained from:	OpenBSD

Modified:
  stable/8/bin/pax/getoldopt.c
Directory Properties:
  stable/8/bin/pax/   (props changed)

Modified: stable/8/bin/pax/getoldopt.c
==============================================================================
--- stable/8/bin/pax/getoldopt.c	Mon Jun 28 14:15:54 2010	(r209575)
+++ stable/8/bin/pax/getoldopt.c	Mon Jun 28 17:06:19 2010	(r209576)
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getoldopt.c,v 1.4 2000/01/22 20:24:51 deraadt Exp $	*/
+/*	$OpenBSD: getoldopt.c,v 1.9 2009/10/27 23:59:22 deraadt Exp $	*/
 /*	$NetBSD: getoldopt.c,v 1.3 1995/03/21 09:07:28 cgd Exp $	*/
 
 /*-
@@ -7,7 +7,7 @@
  * otherwise, it uses the old rules used by tar, dump, and ps.
  *
  * Written 25 August 1985 by John Gilmore (ihnp4!hoptoad!gnu) and placed
- * in the Pubic Domain for your edification and enjoyment.
+ * in the Public Domain for your edification and enjoyment.
  */
 
 #include <sys/cdefs.h>
@@ -33,7 +33,8 @@ getoldopt(int argc, char **argv, const c
 	optarg = NULL;
 
 	if (key == NULL) {		/* First time */
-		if (argc < 2) return EOF;
+		if (argc < 2)
+			return (-1);
 		key = argv[1];
 		if (*key == '-')
 			use_getopt++;
@@ -42,18 +43,18 @@ getoldopt(int argc, char **argv, const c
 	}
 
 	if (use_getopt)
-		return getopt(argc, argv, optstring);
+		return (getopt(argc, argv, optstring));
 
 	c = *key++;
 	if (c == '\0') {
 		key--;
-		return EOF;
+		return (-1);
 	}
 	place = strchr(optstring, c);
 
 	if (place == NULL || c == ':') {
 		fprintf(stderr, "%s: unknown option %c\n", argv[0], c);
-		return('?');
+		return ('?');
 	}
 
 	place++;
@@ -64,9 +65,9 @@ getoldopt(int argc, char **argv, const c
 		} else {
 			fprintf(stderr, "%s: %c argument missing\n",
 				argv[0], c);
-			return('?');
+			return ('?');
 		}
 	}
 
-	return(c);
+	return (c);
 }