#include <h/tws.h>
#include <h/fmt_compile.h>
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
#endif
+#include <time.h>
+
#ifdef MULTIBYTE_SUPPORT
# include <wctype.h>
# include <wchar.h>
#endif
-#define NFMTS MAXARGS
-
extern char *formataddr(); /* hook for custom address formatting */
extern int fmt_norm; /* defined in sbr/fmt_def.c = AD_NAME */
case LOCALHOST:
str = mn->m_mbox;
break;
- case UUCPHOST:
- snprintf(buffer, sizeof(buffer), "%s!%s",
- mn->m_host, mn->m_mbox);
- str = buffer;
- break;
default:
if (mn->m_mbox) {
- snprintf(buffer, sizeof(buffer), "%s@%s",
- mn->m_mbox, mn->m_host);
+ snprintf(buffer, sizeof(buffer), "%s@%s", mn->m_mbox, mn->m_host);
str= buffer;
} else
str = mn->m_text;
}
fmt++;
}
-#ifndef JLR
- finished:;
+finished:;
if (cp[-1] != '\n')
*cp++ = '\n';
- *cp = 0;
+ *cp = '\0';
return ((struct format *)0);
-#else /* JLR */
+
+#ifdef JLR
+ /* I'll remove this as soon as I understand what it does. --meillo */
if (cp[-1] != '\n')
*cp++ = '\n';
while (fmt->f_type != FT_DONE)
finished:;
*cp = '\0';
return (fmt->f_value ? ++fmt : (struct format *) 0);
-
#endif /* JLR */
+
}