X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fpick.c;h=d8edbcaa9b8b1c7c007359f998b735a9073ffa60;hp=73babadf4e530e960491dc8af757a0dbf6566172;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=27826f9353e0f0b04590b7d0f8f83e60462b90f0 diff --git a/uip/pick.c b/uip/pick.c index 73babad..d8edbca 100644 --- a/uip/pick.c +++ b/uip/pick.c @@ -10,16 +10,10 @@ #include #include -#ifdef TIME_WITH_SYS_TIME +#ifdef HAVE_SYS_TIME_H # include -# include -#else -# ifdef TM_IN_SYS_TIME -# include -# else -# include -# endif #endif +#include static struct swit switches[] = { #define ANDSW 0 @@ -67,7 +61,7 @@ static struct swit switches[] = { #define NLISTSW 21 { "nolist", 0 }, #define VERSIONSW 22 - { "version", 0 }, + { "Version", 0 }, #define HELPSW 23 { "help", 0 }, { NULL, 0 } @@ -87,7 +81,8 @@ static void putzero_done(int) NORETURN; int main(int argc, char **argv) { - int publicsw = -1, zerosw = 1, seqp = 0, vecp = 0; + int publicsw = -1, zerosw = 1, vecp = 0; + unsigned int seqp = 0; int lo, hi, msgnum; char *maildir, *folder = NULL, buf[100]; char *cp, **argp, **arguments; @@ -481,23 +476,23 @@ static struct nexus *head; /* ** prototypes for date routines */ -static struct tws *tws_parse(); -static struct tws *tws_special(); +static struct tws *tws_parse(char *, int); +static struct tws *tws_special(char *); /* ** static prototypes */ -static void PRaction(); -static int gcompile(); -static int advance(); -static int cclass(); -static int tcompile(); - -static struct nexus *parse(); -static struct nexus *nexp1(); -static struct nexus *nexp2(); -static struct nexus *nexp3(); -static struct nexus *newnexus(); +static void PRaction(struct nexus *, int); +static int gcompile(struct nexus *, char *); +static int advance(char *, char *); +static int cclass(unsigned char *, int, int); +static int tcompile(char *, struct tws *, int); + +static struct nexus *parse(void); +static struct nexus *nexp1(void); +static struct nexus *nexp2(void); +static struct nexus *nexp3(void); +static struct nexus *newnexus(int (*)()); static int ORaction(); static int ANDaction(); @@ -834,7 +829,7 @@ PRaction(struct nexus *n, int level) if (n->n_action == TWSaction) { fprintf(stderr, "TEMPORAL(%s) %s: %s\n", n->n_after ? "after" : "before", n->n_datef, - dasctime(&n->n_tws, TW_NULL)); + dasctime(&n->n_tws)); return; } fprintf(stderr, "UNKNOWN(0x%x)\n",