Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/mknod.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/coreutils/mknod.c (modified) (2 diffs)

branches/2.2.5/mindi-busybox/coreutils/mknod.c

@@ -5 +5 @@
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@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
- * 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
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
 #include <sys/sysmacros.h>  // For makedev
-#include <unistd.h>
-#include "busybox.h"
+
+#include "libbb.h"
 #include "libcoreutils/coreutils.h"
 
-static const char modes_chars[] = { 'p', 'c', 'u', 'b', 0, 1, 1, 2 };
+static const char modes_chars[] ALIGN1 = { 'p', 'c', 'u', 'b', 0, 1, 1, 2 };
 static const mode_t modes_cubp[] = { S_IFIFO, S_IFCHR, S_IFBLK };
 
+int mknod_main(int argc, char **argv);
 int mknod_main(int argc, char **argv)
 {
@@ -49 +34 @@
         dev = 0;
         if ((*name != 'p') && ((argc -= 2) == 2)) {
-            /* Autodetect what the system supports; thexe macros should
+            /* Autodetect what the system supports; these macros should
              * optimize out to two constants. */
-            dev = makedev(bb_xgetularg10_bnd(argv[2], 0, major(UINT_MAX)),
-                          bb_xgetularg10_bnd(argv[3], 0, minor(UINT_MAX)));
+            dev = makedev(xatoul_range(argv[2], 0, major(UINT_MAX)),
+                          xatoul_range(argv[3], 0, minor(UINT_MAX)));
         }