[hackers] [ubase] Stop using *_FILENO || sin

From: <git_AT_suckless.org>
Date: Sun, 30 Nov 2014 14:13:25 +0100

commit 10d6bf2f4d73f2712a058327885aca19a44cee02
Author: sin <sin_AT_2f30.org>
Date: Sun Nov 30 13:12:15 2014 +0000

    Stop using *_FILENO

diff --git a/dmesg.c b/dmesg.c
index 0401ded..31b7cb6 100644
--- a/dmesg.c
+++ b/dmesg.c
_AT_@ -60,7 +60,7 @@ main(int argc, char *argv[])
         if (n < 0)
                 eprintf("klogctl:");
 
- dmesg_show(STDOUT_FILENO, buf, n);
+ dmesg_show(1, buf, n);
 
         if (cflag && klogctl(SYSLOG_ACTION_CLEAR, NULL, 0) < 0)
                 eprintf("klogctl:");
diff --git a/getty.c b/getty.c
index 8ecfdd3..4d0efdf 100644
--- a/getty.c
+++ b/getty.c
_AT_@ -73,9 +73,9 @@ main(int argc, char *argv[])
         fd = open(tty, O_RDWR);
         if (fd < 0)
                 eprintf("open %s:", tty);
- dup2(fd, STDIN_FILENO);
- dup2(fd, STDOUT_FILENO);
- dup2(fd, STDERR_FILENO);
+ dup2(fd, 0);
+ dup2(fd, 1);
+ dup2(fd, 2);
         if (fchown(fd, 0, 0) < 0)
                 weprintf("fchown %s:", tty);
         if (fchmod(fd, 0600) < 0)
_AT_@ -118,10 +118,10 @@ main(int argc, char *argv[])
         fflush(stdout);
 
         /* Flush pending input */
- ioctl(STDIN_FILENO, TCFLSH, (void *)0);
+ ioctl(0, TCFLSH, (void *)0);
         memset(logname, 0, sizeof(logname));
         while (1) {
- n = read(STDIN_FILENO, &c, 1);
+ n = read(0, &c, 1);
                 if (n < 0)
                         eprintf("read:");
                 if (n == 0)
diff --git a/login.c b/login.c
index 45b69ea..31b7a26 100644
--- a/login.c
+++ b/login.c
_AT_@ -88,7 +88,7 @@ main(int argc, char *argv[])
         gid = pw->pw_gid;
 
         /* Flush pending input */
- ioctl(STDIN_FILENO, TCFLSH, (void *)0);
+ ioctl(0, TCFLSH, (void *)0);
 
         pass = getpass("Password: ");
         if (!pass)
_AT_@ -96,7 +96,7 @@ main(int argc, char *argv[])
         if (pw_check(pw, pass) <= 0)
                 exit(1);
 
- tty = ttyname(STDIN_FILENO);
+ tty = ttyname(0);
         if (!tty)
                 eprintf("ttyname:");
 
diff --git a/mesg.c b/mesg.c
index c050ea7..58a977a 100644
--- a/mesg.c
+++ b/mesg.c
_AT_@ -28,10 +28,10 @@ main(int argc, char *argv[])
         if (argc > 1)
                 usage();
 
- if (isatty(STDERR_FILENO) == 0)
+ if (isatty(2) == 0)
                 eprintf("stderr: not a tty\n");
 
- if (fstat(STDERR_FILENO, &sb) < 0)
+ if (fstat(2, &sb) < 0)
                 eprintf("fstat stderr:");
 
         if (argc == 0) {
_AT_@ -46,7 +46,7 @@ main(int argc, char *argv[])
         else
                 usage();
 
- if (fchmod(STDERR_FILENO, mode) < 0)
+ if (fchmod(2, mode) < 0)
                 eprintf("fchmod stderr:");
 
         return 0;
diff --git a/passwd.c b/passwd.c
index b2d19f7..ffcda61 100644
--- a/passwd.c
+++ b/passwd.c
_AT_@ -176,7 +176,7 @@ main(int argc, char *argv[])
         }
 
         /* Flush pending input */
- ioctl(STDIN_FILENO, TCFLSH, (void *)0);
+ ioctl(0, TCFLSH, (void *)0);
 
         if (getuid() == 0) {
                 goto newpass;
_AT_@ -220,7 +220,7 @@ newpass:
                 eprintf("password left unchanged\n");
 
         /* Flush pending input */
- ioctl(STDIN_FILENO, TCFLSH, (void *)0);
+ ioctl(0, TCFLSH, (void *)0);
 
         inpass = getpass("Retype new password: ");
         if (!inpass)
diff --git a/ps.c b/ps.c
index c0e53f1..2f555d8 100644
--- a/ps.c
+++ b/ps.c
_AT_@ -104,7 +104,7 @@ psout(struct procstat *ps)
          * the same controlling terminal as the invoker and the same
          * euid as the current user */
         if (!(flags & (PS_aflag | PS_Aflag | PS_dflag))) {
- myttystr = ttyname(STDIN_FILENO);
+ myttystr = ttyname(0);
                 if (myttystr) {
                         if (strcmp(myttystr + strlen("/dev/"), ttystr)) {
                                 free(ttystr);
_AT_@ -125,7 +125,7 @@ psout(struct procstat *ps)
 
         sutime = (ps->stime + ps->utime) / sysconf(_SC_CLK_TCK);
 
- ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);
+ ioctl(1, TIOCGWINSZ, &w);
         if (!(flags & PS_fflag)) {
                 snprintf(buf, sizeof(buf), "%5d %-6s %02u:%02u:%02u %s", ps->pid, ttystr,
                          sutime / 3600, (sutime % 3600) / 60, sutime % 60,
diff --git a/stat.c b/stat.c
index 4523d82..9d9a04c 100644
--- a/stat.c
+++ b/stat.c
_AT_@ -41,7 +41,7 @@ main(int argc, char *argv[])
         } ARGEND;
 
         if (argc == 0) {
- if (fstat(STDIN_FILENO, &st) < 0)
+ if (fstat(0, &st) < 0)
                         eprintf("stat <stdin>:");
                 show_stat("<stdin>", &st);
         }
diff --git a/switch_root.c b/switch_root.c
index b4dd659..2714e3f 100644
--- a/switch_root.c
+++ b/switch_root.c
_AT_@ -117,13 +117,11 @@ main(int argc, char *argv[])
 
         /* if -c is set, redirect stdin/stdout/stderr to console */
         if (console) {
- close(STDIN_FILENO);
+ close(0);
                 if (open(console, O_RDWR) == -1)
                         eprintf("open %s:", console);
- if (dup2(STDIN_FILENO, STDOUT_FILENO) != STDOUT_FILENO)
- eprintf("dup2 %s:", "stdin,stdout");
- if (dup2(STDIN_FILENO, STDERR_FILENO) != STDERR_FILENO)
- eprintf("dup2 %s:", "stdin,stderr");
+ dup2(0, 1);
+ dup2(0, 2);
         }
 
         /* execute init */
diff --git a/who.c b/who.c
index c508ebb..2165811 100644
--- a/who.c
+++ b/who.c
_AT_@ -28,7 +28,7 @@ main(int argc, char *argv[])
         ARGBEGIN {
         case 'm':
                 mflag = 1;
- tty = ttyname(STDIN_FILENO);
+ tty = ttyname(0);
                 if (!tty)
                         eprintf("ttyname: stdin:");
                 if ((ttmp = strrchr(tty, '/')))
Received on Sun Nov 30 2014 - 14:13:25 CET