[BusyBox-cvs] busybox/debianutils mktemp.c,1.1,1.2 readlink.c,1.1,1.2 run_parts.c,1.3,1.4 which.c,1.1,1.2

[Manuel Novoa III]

Update of /var/cvs/busybox/debianutils
In directory winder:/home/mjn3/work/busybox/debianutils

Modified Files:
	mktemp.c readlink.c run_parts.c which.c 
Log Message:
Major coreutils update.


Index: mktemp.c
===================================================================
RCS file: /var/cvs/busybox/debianutils/mktemp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mktemp.c	11 Nov 2002 03:00:04 -0000	1.1
+++ mktemp.c	19 Mar 2003 09:11:41 -0000	1.2
@@ -32,7 +32,7 @@
 extern int mktemp_main(int argc, char **argv)
 {
 	if (argc != 2 && (argc != 3 || strcmp(argv[1], "-q")))
-		show_usage();
+		bb_show_usage();
 	if(mkstemp(argv[argc-1]) < 0)
 		return EXIT_FAILURE;
 	(void) puts(argv[argc-1]);

Index: readlink.c
===================================================================
RCS file: /var/cvs/busybox/debianutils/readlink.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- readlink.c	11 Nov 2002 03:00:04 -0000	1.1
+++ readlink.c	19 Mar 2003 09:11:41 -0000	1.2
@@ -32,7 +32,7 @@
 	/* no options, no getopt */
 
 	if (argc != 2)
-		show_usage();
+		bb_show_usage();
 
 	buf = xreadlink(argv[1]);
 	if (!buf)

Index: run_parts.c
===================================================================
RCS file: /var/cvs/busybox/debianutils/run_parts.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- run_parts.c	8 Jan 2003 03:26:47 -0000	1.3
+++ run_parts.c	19 Mar 2003 09:11:41 -0000	1.4
@@ -78,7 +78,7 @@
 			{
 				const unsigned int mask = (unsigned int) strtol(optarg, NULL, 8);
 				if (mask > 07777) {
-					perror_msg_and_die("bad umask value");
+					bb_perror_msg_and_die("bad umask value");
 				}
 				umask(mask);
 			}
@@ -90,13 +90,13 @@
 			args[argcount++] = optarg;
 			break;
 		default:
-			show_usage();
+			bb_show_usage();
 		}
 	}
 
 	/* We require exactly one argument: the directory name */
 	if (optind != (argc - 1)) {
-		show_usage();
+		bb_show_usage();
 	}
 
 	args[0] = argv[optind];

Index: which.c
===================================================================
RCS file: /var/cvs/busybox/debianutils/which.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- which.c	11 Nov 2002 03:00:04 -0000	1.1
+++ which.c	19 Mar 2003 09:11:41 -0000	1.2
@@ -34,7 +34,7 @@
 	int i, count=1, found, status = EXIT_SUCCESS;
 
 	if (argc <= 1 || **(argv + 1) == '-')
-		show_usage();
+		bb_show_usage();
 	argc--;
 
 	path_list = getenv("PATH");