X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fchown.c;h=07d673f28d12668d785e0a0929a775d64cca0019;hb=637d2266e1ea711f27ab0aec200a196b5eccbbca;hp=43d62b1e07d14c694f459664fdba6e8b799ddd4f;hpb=30592a54514ca52253ed5f2eff64684e32d7ff05;p=oweals%2Fbusybox.git

diff --git a/coreutils/chown.c b/coreutils/chown.c
index 43d62b1e0..07d673f28 100644
--- a/coreutils/chown.c
+++ b/coreutils/chown.c
@@ -1,10 +1,8 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Mini chown/chmod/chgrp implementation for busybox
+ * Mini chown implementation for busybox
  *
- *
- * Copyright (C) 1999,2000,2001 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,77 +20,80 @@
  *
  */
 
-#include <stdio.h>
+/* BB_AUDIT SUSv3 defects - unsupported options -h, -H, -L, and -P. */
+/* BB_AUDIT GNU defects - unsupported options -h, -c, -f, -v, and long options. */
+/* BB_AUDIT Note: gnu chown does not support -H, -L, or -P. */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/chown.html */
+
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
+#include <string.h>
 #include "busybox.h"
 
-/* Don't use lchown for libc5 or glibc older then 2.1.x */
+/* Don't use lchown for glibc older then 2.1.x */
 #if (__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 1)
 #define lchown	chown
 #endif
 
-static long uid = -1;
-static long gid = -1;
+static long uid;
+static long gid;
+
+static int (*chown_func)(const char *, uid_t, gid_t) = chown;
 
 static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
 {
-	if (lchown(fileName, uid, (gid == -1) ? statbuf->st_gid : gid) == 0) {
+	if (chown_func(fileName, uid, (gid == -1) ? statbuf->st_gid : gid) == 0) {
+		chmod(fileName, statbuf->st_mode);
 		return (TRUE);
 	}
-	perror(fileName);
+	bb_perror_msg("%s", fileName);	/* Avoid multibyte problems. */
 	return (FALSE);
 }
 
+#define FLAG_R 1
+#define FLAG_h 2
+
 int chown_main(int argc, char **argv)
 {
-	int opt;
-	int recursiveFlag = FALSE;
-	char *groupName=NULL;
-	char *p=NULL;
-
-	/* do normal option parsing */
-	while ((opt = getopt(argc, argv, "R")) > 0) {
-		switch (opt) {
-			case 'R':
-				recursiveFlag = TRUE;
-			default:
-				show_usage();
-		}
+	int flags;
+	int retval = EXIT_SUCCESS;
+	char *groupName;
+
+	flags = bb_getopt_ulflags(argc, argv, "Rh");
+
+	if (flags & FLAG_h) chown_func = lchown;
+
+	if (argc - optind < 2) {
+		bb_show_usage();
 	}
 
-	if (argc > optind && argc > 2 && argv[optind]) {
-		/* First, check if there is a group name here */
-		groupName = strchr(argv[optind], '.');
-		if (groupName == NULL)
-			groupName = strchr(argv[optind], ':');
-		if (groupName) {
-			*groupName++ = '\0';
-			gid = strtoul(groupName, &p, 10);
-			if (groupName == p)
-				gid = my_getgrnam(groupName);
-		} else {
-			gid = -1;
-		}
-		/* Now check for the username */
-		uid = strtoul(argv[optind], &p, 10);	/* Is is numeric? */
-		if (argv[optind] == p) {
-			uid = my_getpwnam(argv[optind]);
-		}
-	} else {
-		error_msg_and_die(too_few_args);
+	argv += optind;
+
+	/* First, check if there is a group name here */
+	if ((groupName = strchr(*argv, '.')) == NULL) {
+		groupName = strchr(*argv, ':');
 	}
 
+	gid = -1;
+	if (groupName) {
+		*groupName++ = '\0';
+		gid = get_ug_id(groupName, my_getgrnam);
+	}
+
+	/* Now check for the username */
+	uid = get_ug_id(*argv, my_getpwnam);
+
+	++argv;
+	
 	/* Ok, ready to do the deed now */
-	while (optind++ < argc-1) {
-		if (recursive_action (argv[optind], recursiveFlag, FALSE, FALSE, 
-					fileAction, fileAction, NULL) == FALSE) {
-			return EXIT_FAILURE;
+	do {
+		if (! recursive_action (*argv, (flags & FLAG_R), FALSE, FALSE, 
+								fileAction, fileAction, NULL)) {
+			retval = EXIT_FAILURE;
 		}
-	}
-	return EXIT_SUCCESS;
+	} while (*++argv);
 
+	return retval;
 }
 
 /*