projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
After nmh 1.0.4, moved from top-level 'nmh' directory to 'nmh/docs'.
[mmh]
/
sbr
/
fmt_scan.c
diff --git
a/sbr/fmt_scan.c
b/sbr/fmt_scan.c
index
630cfc5
..
b8273c9
100644
(file)
--- a/
sbr/fmt_scan.c
+++ b/
sbr/fmt_scan.c
@@
-11,6
+11,17
@@
#include <zotnet/tws/tws.h>
#include <h/fmt_compile.h>
#include <zotnet/tws/tws.h>
#include <h/fmt_compile.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
+
#define NFMTS MAXARGS
extern char *formataddr (); /* hook for custom address formatting */
#define NFMTS MAXARGS
extern char *formataddr (); /* hook for custom address formatting */
@@
-234,7
+245,7
@@
get_x400_friendly (char *mbox, char *buffer, int buffer_len)
return NULL;
if (get_x400_comp (mbox, "/PN=", buffer, buffer_len)) {
return NULL;
if (get_x400_comp (mbox, "/PN=", buffer, buffer_len)) {
- for (mbox = buffer; mbox = strchr(mbox, '.'); )
+ for (mbox = buffer; (mbox = strchr(mbox, '.')); )
*mbox++ = ' ';
return buffer;
*mbox++ = ' ';
return buffer;
@@
-636,7
+647,7
@@
fmt_scan (struct format *format, char *scanl, int width, int *dat)
}
if (fmt->f_type == FT_LS_ADDR)
goto unfriendly;
}
if (fmt->f_type == FT_LS_ADDR)
goto unfriendly;
- if ((str = mn->m_pers) == NULL)
+ if ((str = mn->m_pers) == NULL) {
if ((str = mn->m_note)) {
strncpy (buffer, str, sizeof(buffer));
str = buffer;
if ((str = mn->m_note)) {
strncpy (buffer, str, sizeof(buffer));
str = buffer;
@@
-674,6
+685,7
@@
fmt_scan (struct format *format, char *scanl, int width, int *dat)
break;
}
}
break;
}
}
+ }
break;
case FT_LOCALDATE:
break;
case FT_LOCALDATE:
@@
-748,9
+760,6
@@
fmt_scan (struct format *format, char *scanl, int width, int *dat)
len -= sp - lp + 1;
while (cp < ep && lp <= sp)
*cp++ = *lp++;
len -= sp - lp + 1;
while (cp < ep && lp <= sp)
*cp++ = *lp++;
- *cp++ = '\n';
- for (i=indent; cp < ep && i > 0; i--)
- *cp++ = ' ';
while (isspace(*lp))
lp++, len--;
if (*lp) {
while (isspace(*lp))
lp++, len--;
if (*lp) {