Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/init/mesg.c

Timestamp:

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

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/init/mesg.c (modified) (2 diffs)

branches/2.2.5/mindi-busybox/init/mesg.c

@@ -8 +8 @@
  */
 
-#include "busybox.h"
-#include <unistd.h>
-#include <stdlib.h>
+#include "libbb.h"
 
 #ifdef USE_TTY_GROUP
@@ -18 +16 @@
 #endif
 
-int mesg_main(int argc, char *argv[])
+int mesg_main(int argc, char **argv);
+int mesg_main(int argc, char **argv)
 {
     struct stat sb;
-    char *tty;
+    const char *tty;
     char c = 0;
 
-    if ((--argc == 0)
-        || ((argc == 1) && (((c = **++argv) == 'y') || (c == 'n')))) {
-        if ((tty = ttyname(STDERR_FILENO)) == NULL) {
+    if (--argc == 0
+     || (argc == 1 && ((c = **++argv) == 'y' || c == 'n'))
+    ) {
+        tty = ttyname(STDERR_FILENO);
+        if (tty == NULL) {
             tty = "ttyname";
         } else if (stat(tty, &sb) == 0) {
+            mode_t m;
             if (argc == 0) {
-                puts(((sb.st_mode & (S_IWGRP | S_IWOTH)) ==
-                      0) ? "is n" : "is y");
+                puts((sb.st_mode & (S_IWGRP|S_IWOTH)) ? "is y" : "is n");
                 return EXIT_SUCCESS;
             }
-            if (chmod
-                (tty,
-                 (c ==
-                  'y') ? sb.st_mode | (S_IWGRP_OR_S_IWOTH) : sb.
-                 st_mode & ~(S_IWGRP | S_IWOTH)) == 0) {
+            m = (c == 'y') ? sb.st_mode | S_IWGRP_OR_S_IWOTH
+                           : sb.st_mode & ~(S_IWGRP|S_IWOTH);
+            if (chmod(tty, m) == 0) {
                 return EXIT_SUCCESS;
             }