BSD 4_3_Reno release

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

diff --git a/usr/src/usr.bin/from/from.c b/usr/src/usr.bin/from/from.c
index a6cb87b..fcc64b2 100644 (file)
--- a/usr/src/usr.bin/from/from.c
+++ b/usr/src/usr.bin/from/from.c
@@ -2,17 +2,19 @@
  * Copyright (c) 1980, 1988 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1980, 1988 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.
+ * Redistribution and use in source and binary forms are permitted provided
+ * that: (1) source distributions retain this entire copyright notice and
+ * comment, and (2) distributions including binaries display the following
+ * acknowledgement:  ``This product includes software developed by the
+ * University of California, Berkeley and its contributors'' in the
+ * documentation or other materials provided with the distribution and in
+ * all advertising materials mentioning features or use of this software.
+ * 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint


@@ -22,12 +24,14 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)from.c     5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)from.c     5.6 (Berkeley) 7/21/90";

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

+#include <sys/types.h>

 #include <ctype.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <pwd.h>
 #include <stdio.h>

+#include <paths.h>

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


@@ -72,7 +76,7 @@ main(argc, argv)
                        }
                        file = pwd->pw_name;
                }
                        }
                        file = pwd->pw_name;
                }

-               (void)sprintf(buf, "/usr/spool/mail/%s", file);
+               (void)sprintf(buf, "%s/%s", _PATH_MAILDIR, file);

                file = buf;
        }
        if (!freopen(file, "r", stdin)) {
                file = buf;
        }
        if (!freopen(file, "r", stdin)) {