projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allowed gdbm as substitute for Berkeley db1/ndbm.h libdb1 (check for
[mmh]
/
uip
/
mhbuildsbr.c
diff --git
a/uip/mhbuildsbr.c
b/uip/mhbuildsbr.c
index
0897551
..
58104a5
100644
(file)
--- a/
uip/mhbuildsbr.c
+++ b/
uip/mhbuildsbr.c
@@
-3,6
+3,10
@@
* mhbuildsbr.c -- routines to expand/translate MIME composition files
*
* $Id$
* mhbuildsbr.c -- routines to expand/translate MIME composition files
*
* $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh. See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
*/
/*
*/
/*
@@
-19,11
+23,22
@@
#include <h/md5.h>
#include <errno.h>
#include <signal.h>
#include <h/md5.h>
#include <errno.h>
#include <signal.h>
-#include <zotnet/mts/mts.h>
-#include <zotnet/tws/tws.h>
+#include <h/mts.h>
+#include <h/tws.h>
#include <h/mime.h>
#include <h/mhparse.h>
#include <h/mime.h>
#include <h/mhparse.h>
+#ifdef TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# ifdef TM_IN_SYS_TIME
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
#ifdef HAVE_SYS_WAIT_H
# include <sys/wait.h>
#endif
#ifdef HAVE_SYS_WAIT_H
# include <sys/wait.h>
#endif
@@
-227,8
+242,7
@@
pidcheck (int status)
fflush (stdout);
fflush (stderr);
fflush (stdout);
fflush (stderr);
- done (1);
- /* NOTREACHED */
+ return done (1);
}
}
@@
-2662,7
+2676,7
@@
losing_ftp:
goto losing_ftp;
#endif
goto losing_ftp;
#endif
- if (cachefile[0])
+ if (cachefile[0]) {
if (caching)
chmod (cachefile, cachetype ? m_gmprot () : 0444);
else {
if (caching)
chmod (cachefile, cachetype ? m_gmprot () : 0444);
else {
@@
-2676,7
+2690,7
@@
losing_ftp:
fseek (gp, 0L, SEEK_SET);
fseek (gp, 0L, SEEK_SET);
- while ((cc = fread (buffer, sizeof(*buffer), sizeof(buffer), gp))
+ while ((cc= fread (buffer, sizeof(*buffer), sizeof(buffer), gp))
> 0)
fwrite (buffer, sizeof(*buffer), cc, fp);
fflush (fp);
> 0)
fwrite (buffer, sizeof(*buffer), cc, fp);
fflush (fp);
@@
-2694,6
+2708,7
@@
losing_ftp:
}
umask (mask);
}
}
umask (mask);
}
+ }
fseek (ce->ce_fp, 0L, SEEK_SET);
*file = ce->ce_file;
fseek (ce->ce_fp, 0L, SEEK_SET);
*file = ce->ce_file;
@@
-3159,11
+3174,12
@@
use_forw:
/* search the arguments for a folder name */
for (ap = arguments; *ap; ap++) {
cp = *ap;
/* search the arguments for a folder name */
for (ap = arguments; *ap; ap++) {
cp = *ap;
- if (*cp == '+' || *cp == '@')
+ if (*cp == '+' || *cp == '@') {
if (folder)
adios (NULL, "only one folder per #forw directive");
else
folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
if (folder)
adios (NULL, "only one folder per #forw directive");
else
folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ }
}
/* else, use the current folder */
}
/* else, use the current folder */