BSD 4_4 release

[unix-history] / usr / src / usr.bin / nohup / nohup.c

diff --git a/usr/src/usr.bin/nohup/nohup.c b/usr/src/usr.bin/nohup/nohup.c
index f08d9a1..d469a13 100644 (file)
--- a/usr/src/usr.bin/nohup/nohup.c
+++ b/usr/src/usr.bin/nohup/nohup.c
@@ -1,43 +1,65 @@
 /*
 /*

- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-char copyright[] =
-"@(#) Copyright (c) 1989 The Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1989, 1993\n\
+       The Regents of the University of California.  All rights reserved.\n";

 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)nohup.c    5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)nohup.c    8.1 (Berkeley) 6/6/93";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>

-#include <sys/signal.h>
-#include <sys/file.h>
-#include <unistd.h>
+#include <sys/stat.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <signal.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+void dofile __P((void));
+void usage __P((void));

 
 

+int

 main(argc, argv)
        int argc;
 main(argc, argv)
        int argc;

-       char **argv;
+       char *argv[];

 {
 {

-       extern int errno;
-       char *strerror();
-

        if (argc < 2)
                usage();
 
        if (argc < 2)
                usage();
 


@@ -58,28 +80,28 @@ main(argc, argv)
        exit(1);
 }
 
        exit(1);
 }
 

+void

 dofile()
 {
        int fd;
        char *p, path[MAXPATHLEN];
 dofile()
 {
        int fd;
        char *p, path[MAXPATHLEN];

-       off_t lseek();
-       char *getenv(), *strcpy(), *strcat(), *strerror();

 
 #define        FILENAME        "nohup.out"
        p = FILENAME;
 
 #define        FILENAME        "nohup.out"
        p = FILENAME;

-       if ((fd = open(p, O_RDWR|O_CREAT, 0600)) >= 0)
+       if ((fd = open(p, O_RDWR|O_CREAT, S_IRUSR | S_IWUSR)) >= 0)

                goto dupit;
        if (p = getenv("HOME")) {
                (void)strcpy(path, p);
                (void)strcat(path, "/");
                (void)strcat(path, FILENAME);
                goto dupit;
        if (p = getenv("HOME")) {
                (void)strcpy(path, p);
                (void)strcat(path, "/");
                (void)strcat(path, FILENAME);

-               if ((fd = open(p = path, O_RDWR|O_CREAT, 0600)) >= 0)
+               if ((fd = open(p = path,
+                   O_RDWR|O_CREAT, S_IRUSR | S_IWUSR)) >= 0)

                        goto dupit;
        }
        (void)fprintf(stderr, "nohup: can't open a nohup.out file.\n");
        exit(1);
 
                        goto dupit;
        }
        (void)fprintf(stderr, "nohup: can't open a nohup.out file.\n");
        exit(1);
 

-dupit: (void)lseek(fd, 0L, SEEK_END);
+dupit: (void)lseek(fd, (off_t)0, SEEK_END);

        if (dup2(fd, STDOUT_FILENO) == -1) {
                (void)fprintf(stderr, "nohup: %s\n", strerror(errno));
                exit(1);
        if (dup2(fd, STDOUT_FILENO) == -1) {
                (void)fprintf(stderr, "nohup: %s\n", strerror(errno));
                exit(1);


@@ -87,6 +109,7 @@ dupit:       (void)lseek(fd, 0L, SEEK_END);
        (void)fprintf(stderr, "sending output to %s\n", p);
 }
 
        (void)fprintf(stderr, "sending output to %s\n", p);
 }
 

+void

 usage()
 {
        (void)fprintf(stderr, "usage: nohup command\n");
 usage()
 {
        (void)fprintf(stderr, "usage: nohup command\n");