BSD 4_3_Tahoe release

[unix-history] / usr / src / usr.bin / tip / cmds.c

diff --git a/usr/src/usr.bin/tip/cmds.c b/usr/src/usr.bin/tip/cmds.c
index 9e308ff..89f31fe 100644 (file)
--- a/usr/src/usr.bin/tip/cmds.c
+++ b/usr/src/usr.bin/tip/cmds.c
@@ -1,27 +1,14 @@
 /*
 /*

- * Copyright (c) 1983 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)cmds.c     5.10 (Berkeley) %G%";
-#endif /* not lint */
+static char sccsid[] = "@(#)cmds.c     5.6 (Berkeley) 12/22/87";
+#endif not lint

 
 #include "tip.h"
 
 #include "tip.h"

-#include "pathnames.h"
-

 /*
  * tip
  *
 /*
  * tip
  *


@@ -618,7 +605,7 @@ abort(msg)
                printf("\r\n%s", msg);
        printf("\r\n[EOT]\r\n");
        daemon_uid();
                printf("\r\n%s", msg);
        printf("\r\n[EOT]\r\n");
        daemon_uid();

-       (void)uu_unlock(uucplock);
+       delock(uucplock);

        unraw();
        exit(0);
 }
        unraw();
        exit(0);
 }


@@ -651,7 +638,7 @@ execute(s)
                cp = value(SHELL);
        else
                cp++;
                cp = value(SHELL);
        else
                cp++;

-       shell_uid();
+       user_uid();

        execl(value(SHELL), cp, "-c", s, 0);
 }
 
        execl(value(SHELL), cp, "-c", s, 0);
 }
 


@@ -810,7 +797,7 @@ expand(name)
        if ((pid = vfork()) == 0) {
                Shell = value(SHELL);
                if (Shell == NOSTR)
        if ((pid = vfork()) == 0) {
                Shell = value(SHELL);
                if (Shell == NOSTR)

-                       Shell = _PATH_BSHELL;
+                       Shell = "/bin/sh";

                close(pivec[0]);
                close(1);
                dup(pivec[1]);
                close(pivec[0]);
                close(1);
                dup(pivec[1]);