Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/uname.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/uname.c (modified) (7 diffs)

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

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /* uname -- print system information
-   Copyright (C) 1989-1999 Free Software Foundation, Inc.
-
-   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, 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.  */
+ * Copyright (C) 1989-1999 Free Software Foundation, Inc.
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
 
 /* BB_AUDIT SUSv3 compliant */
@@ -42 +31 @@
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
 #include <sys/utsname.h>
-#include "busybox.h"
+#include "libbb.h"
 
 typedef struct {
@@ -56 +39 @@
 } uname_info_t;
 
-static const char options[] = "snrvmpa";
-static const unsigned short int utsname_offset[] = {
+static const char options[] ALIGN1 = "snrvmpa";
+static const unsigned short utsname_offset[] ALIGN2 = {
     offsetof(uname_info_t,name.sysname),
     offsetof(uname_info_t,name.nodename),
@@ -66 +49 @@
 };
 
+int uname_main(int argc, char **argv);
 int uname_main(int argc, char **argv)
 {
@@ -75 +59 @@
     char toprint;
 
-    toprint = bb_getopt_ulflags(argc, argv, options);
+    toprint = getopt32(argv, options);
 
     if (argc != optind) {
@@ -103 +87 @@
     strcpy(uname_info.processor, "unknown");
 
-    delta=utsname_offset;
+    delta = utsname_offset;
     do {
         if (toprint & 1) {
-            bb_printf(((char *)(&uname_info)) + *delta);
+            printf(((char *)(&uname_info)) + *delta);
             if (toprint > 1) {
                 putchar(' ');
@@ -115 +99 @@
     putchar('\n');
 
-    bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+    fflush_stdout_and_exit(EXIT_SUCCESS);
 }