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

branches/2.2.5/mindi-busybox/coreutils/tty.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.
  */
 
@@ -24 +11 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/tty.html */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
+int tty_main(int argc, char **argv);
 int tty_main(int argc, char **argv)
 {
     const char *s;
-    int silent;     /* Note: No longer relevant in SUSv3. */
+    USE_INCLUDE_SUSv2(int silent;)  /* Note: No longer relevant in SUSv3. */
     int retval;
 
-    bb_default_error_retval = 2;    /* SUSv3 requires > 1 for error. */
+    xfunc_error_retval = 2; /* SUSv3 requires > 1 for error. */
 
-    silent = bb_getopt_ulflags(argc, argv, "s");
+    USE_INCLUDE_SUSv2(silent = getopt32(argv, "s");)
 
     /* gnu tty outputs a warning that it is ignoring all args. */
@@ -44 +29 @@
     retval = 0;
 
-    if ((s = ttyname(0)) == NULL) {
+    s = ttyname(0);
+    if (s == NULL) {
     /* According to SUSv3, ttyname can on fail with EBADF or ENOTTY.
      * We know the file descriptor is good, so failure means not a tty. */
@@ -50 +36 @@
         retval = 1;
     }
+    USE_INCLUDE_SUSv2(if (!silent) puts(s);)
+    SKIP_INCLUDE_SUSv2(puts(s);)
 
-    if (!silent) {
-        puts(s);
-    }
-
-    bb_fflush_stdout_and_exit(retval);
+    fflush_stdout_and_exit(retval);
 }