Commit e397a017 authored by Karl Heuer's avatar Karl Heuer
Browse files

Replaced all BSD with BSD_SYSTEM.

parent 7c5a1541
...@@ -259,7 +259,7 @@ main (argc, argv) ...@@ -259,7 +259,7 @@ main (argc, argv)
exit (1); exit (1);
} }
#ifdef BSD #ifdef BSD_SYSTEM
cwd = getwd (string); cwd = getwd (string);
#else #else
cwd = getcwd (string, sizeof string); cwd = getcwd (string, sizeof string);
...@@ -374,7 +374,7 @@ main (argc, argv) ...@@ -374,7 +374,7 @@ main (argc, argv)
} }
/* Determine working dir, so we can prefix it to all the arguments. */ /* Determine working dir, so we can prefix it to all the arguments. */
#ifdef BSD #ifdef BSD_SYSTEM
temp = getwd (gwdirb); temp = getwd (gwdirb);
#else #else
temp = getcwd (gwdirb, sizeof gwdirb); temp = getcwd (gwdirb, sizeof gwdirb);
......
...@@ -22,7 +22,7 @@ Boston, MA 02111-1307, USA. */ ...@@ -22,7 +22,7 @@ Boston, MA 02111-1307, USA. */
#define NO_SHORTNAMES #define NO_SHORTNAMES
#include <../src/config.h> #include <../src/config.h>
#if defined (BSD) && !defined (BSD4_1) && !defined (USE_FAKEMAIL) #if defined (BSD_SYSTEM) && !defined (BSD4_1) && !defined (USE_FAKEMAIL)
/* This program isnot used in BSD, so just avoid loader complaints. */ /* This program isnot used in BSD, so just avoid loader complaints. */
int int
main () main ()
......
...@@ -310,13 +310,13 @@ main (argc, argv) ...@@ -310,13 +310,13 @@ main (argc, argv)
if (indesc < 0) if (indesc < 0)
pfatal_with_name (inname); pfatal_with_name (inname);
#if defined (BSD) || defined (XENIX) #if defined (BSD_SYSTEM) || defined (XENIX)
/* In case movemail is setuid to root, make sure the user can /* In case movemail is setuid to root, make sure the user can
read the output file. */ read the output file. */
/* This is desirable for all systems /* This is desirable for all systems
but I don't want to assume all have the umask system call */ but I don't want to assume all have the umask system call */
umask (umask (0) & 0333); umask (umask (0) & 0333);
#endif /* BSD or Xenix */ #endif /* BSD_SYSTEM || XENIX */
outdesc = open (outname, O_WRONLY | O_CREAT | O_EXCL, 0666); outdesc = open (outname, O_WRONLY | O_CREAT | O_EXCL, 0666);
if (outdesc < 0) if (outdesc < 0)
pfatal_with_name (outname); pfatal_with_name (outname);
...@@ -354,7 +354,7 @@ main (argc, argv) ...@@ -354,7 +354,7 @@ main (argc, argv)
} }
} }
#ifdef BSD #ifdef BSD_SYSTEM
if (fsync (outdesc) < 0) if (fsync (outdesc) < 0)
pfatal_and_delete (outname); pfatal_and_delete (outname);
#endif #endif
...@@ -588,7 +588,7 @@ popmail (user, outfile, password) ...@@ -588,7 +588,7 @@ popmail (user, outfile, password)
* directories have lost mail when over quota because these checks were * directories have lost mail when over quota because these checks were
* not made in previous versions of movemail. */ * not made in previous versions of movemail. */
#ifdef BSD #ifdef BSD_SYSTEM
if (fsync (mbfi) < 0) if (fsync (mbfi) < 0)
{ {
error ("Error in fsync: %s", strerror (errno)); error ("Error in fsync: %s", strerror (errno));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment