[BusyBox-cvs] busybox/coreutils install.c,1.6,1.7

Glenn McGrath bug1 at busybox.net
Fri Jan 23 21:40:21 UTC 2004


Update of /var/cvs/busybox/coreutils
In directory nail:/tmp/cvs-serv26536/coreutils

Modified Files:
	install.c 
Log Message:
Check valid options were given


Index: install.c
===================================================================
RCS file: /var/cvs/busybox/coreutils/install.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- install.c	23 Jan 2004 20:28:53 -0000	1.6
+++ install.c	23 Jan 2004 21:40:19 -0000	1.7
@@ -54,8 +54,14 @@
 	int i;
 
 	/* -c exists for backwards compatability, its needed */
+	bb_opt_complementaly = "s~d:d~s";
 	flags = bb_getopt_ulflags(argc, argv, "cdpsg:m:o:", &gid_str, &mode_str, &uid_str);	/* 'a' must be 2nd */
 
+	/* Check valid options were given */
+	if(flags & 0x80000000UL) {
+		bb_show_usage();
+	}
+
 	/* preserve access and modification time, this is GNU behaviour, BSD only preserves modification time */
 	if (flags & INSTALL_OPT_PRESERVE_TIME) {
 		copy_flags |= FILEUTILS_PRESERVE_STATUS;




More information about the busybox-cvs mailing list