don't redefine _PATH_TMP; don't assume it begins "/tmp/";

[unix-history] / usr / src / usr.bin / rdist / main.c

diff --git a/usr/src/usr.bin/rdist/main.c b/usr/src/usr.bin/rdist/main.c
index ac4c898..fd426db 100644 (file)
--- a/usr/src/usr.bin/rdist/main.c
+++ b/usr/src/usr.bin/rdist/main.c
@@ -1,6 +1,19 @@
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ */
+

 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)main.c      4.14 (Berkeley) 85/02/04";
-#endif
+char copyright[] =
+"@(#) Copyright (c) 1983 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)main.c     5.6 (Berkeley) %G%";
+#endif /* not lint */

 
 #include "defs.h"
 
 
 #include "defs.h"
 


@@ -10,9 +23,10 @@ static       char *sccsid = "@(#)main.c      4.14 (Berkeley) 85/02/04";
  * Remote distribution program.
  */
 
  * Remote distribution program.
  */
 

-char   *distfile = "distfile";
-char   tmpfile[] = "/tmp/rdistXXXXXX";
-char   *tmpname = &tmpfile[5];
+char   *distfile = NULL;
+#define _RDIST_TMP     "/rdistXXXXXX"
+char   tempfile[sizeof _PATH_TMP + sizeof _RDIST_TMP + 1];
+char   *tempname;

 
 int    debug;          /* debugging flag */
 int    nflag;          /* NOP flag, just print commands without executing */
 
 int    debug;          /* debugging flag */
 int    nflag;          /* NOP flag, just print commands without executing */


@@ -49,6 +63,12 @@ main(argc, argv)
        strcpy(homedir, pw->pw_dir);
        groupid = pw->pw_gid;
        gethostname(host, sizeof(host));
        strcpy(homedir, pw->pw_dir);
        groupid = pw->pw_gid;
        gethostname(host, sizeof(host));

+       strcpy(tempfile, _PATH_TMP);
+       strcat(tempfile, _RDIST_TMP);
+       if ((tempname = rindex(tempfile, '/')) != 0)
+               tempname++;
+       else
+               tempname = tempfile;

 
        while (--argc > 0) {
                if ((arg = *++argv)[0] != '-')
 
        while (--argc > 0) {
                if ((arg = *++argv)[0] != '-')


@@ -140,7 +160,7 @@ main(argc, argv)
        *hp = NULL;
 
        setreuid(0, userid);
        *hp = NULL;
 
        setreuid(0, userid);

-       mktemp(tmpfile);
+       mktemp(tempfile);

 
        if (iamremote) {
                server();
 
        if (iamremote) {
                server();


@@ -150,9 +170,16 @@ main(argc, argv)
        if (cmdargs)
                docmdargs(argc, argv);
        else {
        if (cmdargs)
                docmdargs(argc, argv);
        else {

-               if (fin == NULL && (fin = fopen(distfile, "r")) == NULL) {
-                       perror(distfile);
-                       exit(1);
+               if (fin == NULL) {
+                       if(distfile == NULL) {
+                               if((fin = fopen("distfile","r")) == NULL)
+                                       fin = fopen("Distfile", "r");
+                       } else
+                               fin = fopen(distfile, "r");
+                       if(fin == NULL) {
+                               perror(distfile ? distfile : "distfile");
+                               exit(1);
+                       }

                }
                yyparse();
                if (nerrs == 0)
                }
                yyparse();
                if (nerrs == 0)