[BusyBox] usage and fdisk patches

[Denis Dowling]

Hello,

Attached are a couple of small patches for the latest CVS busybox. First patch fixes a small problem with the crontab and getty usage messages. The second patch was required to compile busybox fdisk with Linux 2.6.0-test9. 

Regards,
Denis.

Index: include/usage.h
===================================================================
RCS file: /var/cvs/busybox/include/usage.h,v
retrieving revision 1.172
diff -u -b -B -w -p -u -r1.172 usage.h
--- include/usage.h     22 Oct 2003 11:24:38 -0000      1.172
+++ include/usage.h     10 Nov 2003 22:54:30 -0000
@@ -225,7 +225,7 @@
        "\t-c dir\tworking dir"

 #define crontab_trivial_usage \
-       "crontab [-c dir] {file|-}|[-u|-l|-e|-d user]"
+       "[-c dir] {file|-}|[-u|-l|-e|-d user]"
 #define crontab_full_usage \
        "\tfile <opts>  replace crontab from file\n" \
        "\t-    <opts>  replace crontab from stdin\n" \
@@ -744,7 +744,7 @@
         "done\n"

 #define getty_trivial_usage \
-       "getty [OPTIONS]... baud_rate,... line [termtype]"
+       "[OPTIONS]... baud_rate,... line [termtype]"
 #define getty_full_usage \
        "\nOpens a tty, prompts for a login name, then invokes /bin/login\n\n" \
        "Options:\n" \


Index: util-linux/fdisk.c
===================================================================
RCS file: /var/cvs/busybox/util-linux/fdisk.c,v
retrieving revision 1.11
diff -u -b -B -w -p -u -r1.11 fdisk.c
--- util-linux/fdisk.c  3 Nov 2003 08:59:51 -0000       1.11
+++ util-linux/fdisk.c  10 Nov 2003 22:54:50 -0000
@@ -29,8 +29,10 @@

 #include <endian.h>
 #define u_char  unsigned char
+#define u8 unsigned char
 #include <scsi/scsi.h>          /* SCSI_IOCTL_GET_IDLUN */
 #undef u_char
+#undef u8

 #include <sys/ioctl.h>
 #include <sys/param.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.busybox.net/pipermail/busybox/attachments/20031111/68a865ea/attachment-0002.htm