--- rxvt-unicode/src/ptytty.C	2004/01/31 03:27:45	1.5
+++ rxvt-unicode/src/ptytty.C	2004/02/13 12:16:21	1.6
@@ -65,7 +65,7 @@
  */
 /* EXTPROTO */
 int
-rxvt_get_pty(int *fd_tty, const char **ttydev)
+rxvt_get_pty (int *fd_tty, const char **ttydev)
 {
   int pfd;
 
@@ -73,15 +73,15 @@
 
   char tty_name[sizeof "/dev/pts/????\0"];
 
-  if (openpty(&pfd, fd_tty, tty_name, NULL, NULL) != -1)
+  if (openpty (&pfd, fd_tty, tty_name, NULL, NULL) != -1)
     {
-      *ttydev = strdup(tty_name);
+      *ttydev = strdup (tty_name);
       return pfd;
     }
 #endif
 
 #ifdef PTYS_ARE__GETPTY
-  *ttydev = _getpty(&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
+  *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
   if (*ttydev != NULL)
     return pfd;
 #endif
@@ -90,8 +90,8 @@
 
   char           *ptydev;
 
-  while ((ptydev = getpty()) != NULL)
-    if ((pfd = open(ptydev, O_RDWR | O_NOCTTY, 0)) >= 0)
+  while ((ptydev = getpty ()) != NULL)
+    if ((pfd = open (ptydev, O_RDWR | O_NOCTTY, 0)) >= 0)
       {
         *ttydev = ptydev;
         return pfd;
@@ -103,38 +103,38 @@
 
   {
 #  ifdef PTYS_ARE_GETPT
-    pfd = getpt();
+    pfd = getpt ();
 #  else
 
-    pfd = open("/dev/ptmx", O_RDWR | O_NOCTTY, 0);
+    pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0);
 #  endif
 
     if (pfd >= 0)
       {
-        if (grantpt(pfd) == 0	/* change slave permissions */
-            && unlockpt(pfd) == 0)
+        if (grantpt (pfd) == 0	/* change slave permissions */
+            && unlockpt (pfd) == 0)
           {	/* slave now unlocked */
-            *ttydev = ptsname(pfd);	/* get slave's name */
+            *ttydev = ptsname (pfd);	/* get slave's name */
             return pfd;
           }
-        close(pfd);
+        close (pfd);
       }
   }
 # endif
 #endif
 
 #ifdef PTYS_ARE_PTC
-  if ((pfd = open("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0)
+  if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0)
     {
-      *ttydev = ttyname(pfd);
+      *ttydev = ttyname (pfd);
       return pfd;
     }
 #endif
 
 #ifdef PTYS_ARE_CLONE
-  if ((pfd = open("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0)
+  if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0)
     {
-      *ttydev = ptsname(pfd);
+      *ttydev = ptsname (pfd);
       return pfd;
     }
 #endif
@@ -146,25 +146,25 @@
     char            pty_name[] = "/dev/ptyp???";
     char            tty_name[] = "/dev/ttyp???";
 
-    c1 = &(pty_name[sizeof(pty_name) - 4]);
-    c2 = &(tty_name[sizeof(tty_name) - 4]);
+    c1 = & (pty_name[sizeof (pty_name) - 4]);
+    c2 = & (tty_name[sizeof (tty_name) - 4]);
     for (idx = 0; idx < 256; idx++)
       {
-        sprintf(c1, "%d", idx);
-        sprintf(c2, "%d", idx);
-        if (access(tty_name, F_OK) < 0)
+        sprintf (c1, "%d", idx);
+        sprintf (c2, "%d", idx);
+        if (access (tty_name, F_OK) < 0)
           {
             idx = 256;
             break;
           }
-        if ((pfd = open(pty_name, O_RDWR | O_NOCTTY, 0)) >= 0)
+        if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0)
           {
-            if (access(tty_name, R_OK | W_OK) == 0)
+            if (access (tty_name, R_OK | W_OK) == 0)
               {
-                *ttydev = strdup(tty_name);
+                *ttydev = strdup (tty_name);
                 return pfd;
               }
-            close(pfd);
+            close (pfd);
           }
       }
   }
@@ -184,20 +184,20 @@
 
     for (c1 = PTYCHAR1; *c1; c1++)
       {
-        pty_name[(sizeof(pty_name) - 3)] =
-          tty_name[(sizeof(pty_name) - 3)] = *c1;
+        pty_name[ (sizeof (pty_name) - 3)] =
+          tty_name[ (sizeof (pty_name) - 3)] = *c1;
         for (c2 = PTYCHAR2; *c2; c2++)
           {
-            pty_name[(sizeof(pty_name) - 2)] =
-              tty_name[(sizeof(pty_name) - 2)] = *c2;
-            if ((pfd = open(pty_name, O_RDWR | O_NOCTTY, 0)) >= 0)
+            pty_name[ (sizeof (pty_name) - 2)] =
+              tty_name[ (sizeof (pty_name) - 2)] = *c2;
+            if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0)
               {
-                if (access(tty_name, R_OK | W_OK) == 0)
+                if (access (tty_name, R_OK | W_OK) == 0)
                   {
-                    *ttydev = strdup(tty_name);
+                    *ttydev = strdup (tty_name);
                     return pfd;
                   }
-                close(pfd);
+                close (pfd);
               }
           }
       }
@@ -228,7 +228,7 @@
 #ifndef __QNX__
   int fd;
 
-  D_TTY ((stderr, "rxvt_control_tty(): pid: %d, tty fd: %d, dev: %s", getpid(), fd_tty, ttydev));
+  D_TTY ((stderr, "rxvt_control_tty (): pid: %d, tty fd: %d, dev: %s", getpid (), fd_tty, ttydev));
   /* ---------------------------------------- */
 # ifdef HAVE_SETSID
   setsid ();
@@ -242,7 +242,7 @@
 # ifdef TIOCNOTTY
 
   fd = open ("/dev/tty", O_RDWR | O_NOCTTY);
-  D_TTY ((stderr, "rxvt_control_tty(): Voiding tty associations: previous=%s", fd < 0 ? "no" : "yes"));
+  D_TTY ((stderr, "rxvt_control_tty (): Voiding tty associations: previous=%s", fd < 0 ? "no" : "yes"));
   if (fd >= 0)
     {
       ioctl (fd, TIOCNOTTY, NULL);	/* void tty associations */
@@ -251,7 +251,7 @@
 # endif
   /* ---------------------------------------- */
   fd = open ("/dev/tty", O_RDWR | O_NOCTTY);
-  D_TTY ((stderr, "rxvt_control_tty(): /dev/tty has controlling tty? %s", fd < 0 ? "no (good)" : "yes (bad)"));
+  D_TTY ((stderr, "rxvt_control_tty (): /dev/tty has controlling tty? %s", fd < 0 ? "no (good)" : "yes (bad)"));
   if (fd >= 0)
     close (fd);		/* ouch: still have controlling tty */
   /* ---------------------------------------- */
@@ -262,22 +262,22 @@
    *    ldterm: standard terminal line discipline.
    *    ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
    *
-   * After we push the STREAMS modules, the first open() on the slave side
+   * After we push the STREAMS modules, the first open () on the slave side
    * (i.e. the next section between the dashes giving us "tty opened OK")
    * should make the "ptem" (or "ldterm" depending upon either which OS
    * version or which set of manual pages you have) module give us a
-   * controlling terminal.  We must already have close()d the master side
+   * controlling terminal.  We must already have close ()d the master side
    * fd in this child process before we push STREAMS modules on because the
-   * documentation is really unclear about whether it is any close() on
-   * the master side or the last close() - i.e. a proper STREAMS dismantling
-   * close() - on the master side which causes a hang up to be sent
+   * documentation is really unclear about whether it is any close () on
+   * the master side or the last close () - i.e. a proper STREAMS dismantling
+   * close () - on the master side which causes a hang up to be sent
    * through - Geoff Wing
    */
 # ifdef HAVE_ISASTREAM
   if (isastream (fd_tty) == 1)
 # endif
     {
-      D_TTY ((stderr, "rxvt_control_tty(): Pushing STREAMS modules"));
+      D_TTY ((stderr, "rxvt_control_tty (): Pushing STREAMS modules"));
       ioctl (fd_tty, I_PUSH, "ptem");
       ioctl (fd_tty, I_PUSH, "ldterm");
       ioctl (fd_tty, I_PUSH, "ttcompat");
@@ -286,24 +286,24 @@
   /* ---------------------------------------- */
 # if defined(TIOCSCTTY)
   fd = ioctl (fd_tty, TIOCSCTTY, NULL);
-  D_TTY ((stderr, "rxvt_control_tty(): ioctl(..,TIOCSCTTY): %d", fd));
+  D_TTY ((stderr, "rxvt_control_tty (): ioctl (..,TIOCSCTTY): %d", fd));
 # elif defined(TIOCSETCTTY)
   fd = ioctl (fd_tty, TIOCSETCTTY, NULL);
-  D_TTY ((stderr, "rxvt_control_tty(): ioctl(..,TIOCSETCTTY): %d", fd));
+  D_TTY ((stderr, "rxvt_control_tty (): ioctl (..,TIOCSETCTTY): %d", fd));
 # else
   fd = open (ttydev, O_RDWR);
-  D_TTY ((stderr, "rxvt_control_tty(): tty open%s", fd < 0 ? " failure" : "ed OK"));
+  D_TTY ((stderr, "rxvt_control_tty (): tty open%s", fd < 0 ? " failure" : "ed OK"));
   if (fd >= 0)
-    close(fd);
+    close (fd);
 # endif
   /* ---------------------------------------- */
   fd = open ("/dev/tty", O_WRONLY);
-  D_TTY ((stderr, "rxvt_control_tty(): do we have controlling tty now: %s", fd < 0 ? "no (fatal)" : "yes (good)"));
+  D_TTY ((stderr, "rxvt_control_tty (): do we have controlling tty now: %s", fd < 0 ? "no (fatal)" : "yes (good)"));
   if (fd < 0)
     return -1;		/* fatal */
   close (fd);
   /* ---------------------------------------- */
-  D_TTY ((stderr, "rxvt_control_tty(): tcgetpgrp(): %d  getpgrp(): %d", tcgetpgrp(fd_tty), getpgrp()));
+  D_TTY ((stderr, "rxvt_control_tty (): tcgetpgrp (): %d  getpgrp (): %d", tcgetpgrp (fd_tty), getpgrp ()));
   /* ---------------------------------------- */
 #endif				/* ! __QNX__ */