BSD 4_4 release

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

diff --git a/usr/src/usr.bin/xsend/xsend/xsend.c b/usr/src/usr.bin/xsend/xsend/xsend.c
index 36d88e6..ad14aa4 100644 (file)
--- a/usr/src/usr.bin/xsend/xsend/xsend.c
+++ b/usr/src/usr.bin/xsend/xsend/xsend.c
@@ -1,18 +1,26 @@
+/*-
+ * This module is believed to contain source code proprietary to AT&T.
+ * Use and redistribution is subject to the Berkeley Software License
+ * Agreement and your Software Agreement with AT&T (Western Electric).
+ */
+

 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)xsend.c    4.5 %G%";
-#endif
+static char sccsid[] = "@(#)xsend.c    8.1 (Berkeley) 6/6/93";
+#endif /* not lint */

 
 

-#include "xmail.h"
-#include <sys/types.h>
-#include <pwd.h>
+#include <sys/param.h>

 #include <sys/stat.h>
 #include <sys/dir.h>
 #include <sys/stat.h>
 #include <sys/dir.h>

+#include <pwd.h>
+#include "xmail.h"
+#include "pathnames.h"
+

 extern int errno;
 struct stat stbuf;
 int uid, destuid;
 extern int errno;
 struct stat stbuf;
 int uid, destuid;

-char *myname, *dest, *keyfile[128], line[128];
+char *myname, *dest, keyfile[128], line[128];

 struct direct *dbuf;
 struct direct *dbuf;

-char *maildir = "/usr/spool/secretmail/";
+char *maildir = _PATH_SECRETMAIL;

 FILE *kf, *mf;
 DIR *df;
 MINT *a[42], *cd[6][128];
 FILE *kf, *mf;
 DIR *df;
 MINT *a[42], *cd[6][128];


@@ -74,13 +82,13 @@ main(argc, argv) char **argv;
 #endif
        run();
        {
 #endif
        run();
        {

-               char    hostname[32];
+               char    hostname[MAXHOSTNAMELEN];

                FILE    *nf, *popen();
                struct  passwd  *passp;
 
                FILE    *nf, *popen();
                struct  passwd  *passp;
 

-               sprintf(buf, "/bin/mail %s", dest);
+               sprintf(buf, "%s %s", _PATH_MAIL, dest);

                if ((nf = popen(buf, "w")) == NULL)
                if ((nf = popen(buf, "w")) == NULL)

-                       xfatal("cannot pipe to /bin/mail");
+                       xfatal("cannot pipe to %s", _PATH_MAIL);

                passp = getpwuid(getuid());
                if (passp == 0){
                        pclose(nf);
                passp = getpwuid(getuid());
                if (passp == 0){
                        pclose(nf);