Some accrued fixes/updates.

    * cp/mv now accepts (and ignores) the -f flag, since it always
	does force anyway
    * tail can now accept -<num> commands (e.g. -10) for better
	compatibility with the standard tail command
    * added a simple id implementation; doesn't support supp. groups yet

2 files changed, 96 insertions, 2 deletions

diff --git a/coreutils/id.c b/coreutils/id.c
new file mode 100644
index 000000000..8ded0e521
--- /dev/null
+++ b/coreutils/id.c
@@ -0,0 +1,92 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Mini id implementation for busybox
+ *
+ *
+ * Copyright (C) 2000 by Randolph Chung <tausq@debian.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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include "internal.h"
+#include <stdio.h>
+#include <unistd.h>
+#include <pwd.h>
+#include <grp.h>
+#include <sys/types.h>
+
+static const char id_usage[] =
+	"id [OPTIONS]... [USERNAME]\n\n"
+	"Print information for USERNAME or the current user\n\n"
+	"\t-g\tprints only the group ID\n"
+	"\t-u\tprints only the user ID\n"
+	"\t-r\tprints the real user ID instead of the effective ID (with -ug)\n\n";
+
+extern int id_main(int argc, char **argv)
+{
+	int no_user = 0, no_group = 0, print_real = 0;
+	char *cp, *user, *group;
+	gid_t gid;
+	
+	cp = user = group = NULL;
+
+	argc--; argv++;
+
+	while (argc > 0) {
+		cp = *argv;
+		if (*cp == '-') {
+			switch (*++cp) {
+			case 'u': no_group = 1; break;
+			case 'g': no_user = 1; break;
+			case 'r': print_real = 1; break;
+			default: usage(id_usage);
+			}
+		} else {
+			user = cp;			
+		}
+		argc--; argv++;
+	}
+
+	if (no_user && no_group) usage(id_usage);
+
+	if (user == NULL) {
+		user = xmalloc(9);
+		group = xmalloc(9);
+		if (print_real) {
+			my_getpwuid(user, getuid());
+			my_getgrgid(group, getgid());
+		} else {
+			my_getpwuid(user, geteuid());
+			my_getgrgid(group, getegid());
+		}
+	} else {
+		group = xmalloc(9);
+	    gid = my_getpwnamegid(user);
+		my_getgrgid(group, gid);
+	}
+
+	if (no_group) printf("%u\n", my_getpwnam(user));
+	else if (no_user) printf("%u\n", my_getgrnam(group));
+	else
+		printf("uid=%u(%s) gid=%u(%s)\n",
+			   my_getpwnam(user), user, my_getgrnam(group), group);
+	
+
+	exit(0);
+}
+
+
+/* END CODE */
diff --git a/coreutils/tail.c b/coreutils/tail.c
index 315eee188..321c5c4b2 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -368,8 +368,10 @@ extern int tail_main(int argc, char **argv)
 			case 'h':
 				usage(tail_usage);
 			default:
-				fprintf(stderr, "tail: invalid option -- %c\n", opt);
-				usage(tail_usage);
+				if ((n_units = atoi(&argv[i][1])) < 1) {
+					fprintf(stderr, "tail: invalid option -- %c\n", opt);
+					usage(tail_usage);
+				}
 			}
 		} else {
 			break;