Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 1a7f20db 1a7f20db3480c96e0a8b3dede0dac33ca7c8ac83 by Sergey Poznyakoff
Options

(struct mh_option): Removed "longopt" member.

1 parent e66e53ee
Inline Side-by-side
Showing 8 changed files with 50 additions and 51 deletions
......@@ -55,16 +55,16 @@ static struct argp_option options[] = {
/* Traditional MH options */
struct mh_option mh_option[] = {
{"build", 1, NULL, },
{"file", 2, NULL, MH_OPT_ARG, "draftfile"},
{"form", 2, NULL, MH_OPT_ARG, "formatfile"},
{"draftfolder", 6, NULL, MH_OPT_ARG, "folder"},
{"nodraftfolder", 3, NULL },
{"draftmessage", 6, NULL },
{"editor", 1, NULL, MH_OPT_ARG, "program"},
{"noedit", 3, NULL, },
{"whatnowproc", 2, NULL, MH_OPT_ARG, "program"},
{"nowhatnowproc", 3, NULL },
{"build", 1, },
{"file", 2, MH_OPT_ARG, "draftfile"},
{"form", 2, MH_OPT_ARG, "formatfile"},
{"draftfolder", 6, MH_OPT_ARG, "folder"},
{"nodraftfolder", 3, },
{"draftmessage", 6, },
{"editor", 1, MH_OPT_ARG, "program"},
{"noedit", 3, },
{"whatnowproc", 2, MH_OPT_ARG, "program"},
{"nowhatnowproc", 3, },
{ 0 }
};
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -35,8 +35,8 @@ static struct argp_option options[] = {
/* Traditional MH options */
struct mh_option mh_option[] = {
{"form", 4, NULL, MH_OPT_ARG, "formatfile"},
{"format", 5, NULL, MH_OPT_ARG, "string"},
{"form", 4, MH_OPT_ARG, "formatfile"},
{"format", 5, MH_OPT_ARG, "string"},
{ 0 }
};
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -70,16 +70,16 @@ static struct argp_option options[] = {
/* Traditional MH options */
struct mh_option mh_option[] = {
{"print", 2, NULL, 0, NULL },
{"list", 1, NULL, 0, NULL },
{"push", 2, NULL, 0, NULL },
{"pop", 2, NULL, 0, NULL },
{"all", 1, NULL, 0, NULL },
{"create", 1, NULL, MH_OPT_BOOL, NULL},
{"fast", 1, NULL, MH_OPT_BOOL, NULL},
{"header", 1, NULL, MH_OPT_BOOL, NULL},
{"recurse", 1, NULL, MH_OPT_BOOL, NULL},
{"total", 1, NULL, MH_OPT_BOOL, NULL},
{"print", 2, 0, NULL },
{"list", 1, 0, NULL },
{"push", 2, 0, NULL },
{"pop", 2, 0, NULL },
{"all", 1, 0, NULL },
{"create", 1, MH_OPT_BOOL, NULL},
{"fast", 1, MH_OPT_BOOL, NULL},
{"header", 1, MH_OPT_BOOL, NULL},
{"recurse", 1, MH_OPT_BOOL, NULL},
{"total", 1, MH_OPT_BOOL, NULL},
{NULL},
};
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -44,15 +44,15 @@ static struct argp_option options[] = {
/* Traditional MH options */
struct mh_option mh_option[] = {
{"audit", 5, NULL, MH_OPT_ARG, "audit-file" },
{"noaudit", 3, NULL, 0, },
{"changecur", 1, NULL, MH_OPT_BOOL},
{"file", 2, NULL, MH_OPT_ARG, "input-file"},
{"form", 4, NULL, MH_OPT_ARG, "format-file"},
{"format", 5, NULL, MH_OPT_ARG, "string"},
{"truncate", 2, NULL, MH_OPT_BOOL, },
{"width", 1, NULL, MH_OPT_ARG, "number"},
{"quiet", 1, NULL, 0, },
{"audit", 5, MH_OPT_ARG, "audit-file" },
{"noaudit", 3, 0, },
{"changecur", 1, MH_OPT_BOOL},
{"file", 2, MH_OPT_ARG, "input-file"},
{"form", 4, MH_OPT_ARG, "format-file"},
{"format", 5, MH_OPT_ARG, "string"},
{"truncate", 2, MH_OPT_BOOL, },
{"width", 1, MH_OPT_ARG, "number"},
{"quiet", 1, 0, },
{ 0 }
};
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -68,7 +68,7 @@ mh_getopt (int argc, char **argv, struct mh_option *mh_opt, const char *doc)
if (p->opt)
{
char *longopt = p->longopt ? p->longopt : p->opt;
char *longopt = p->opt;
switch (p->flags)
{
case MH_OPT_BOOL:
......
......@@ -25,7 +25,6 @@ struct mh_option
{
char *opt;
int match_len;
char *longopt;
int flags;
char *arg;
};
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -50,13 +50,13 @@ static struct argp_option options[] = {
/* Traditional MH options */
struct mh_option mh_option[] = {
{"clear", 1, NULL, MH_OPT_BOOL},
{"form", 4, NULL, MH_OPT_ARG, "formatfile"},
{"format", 5, NULL, MH_OPT_ARG, "string"},
{"header", 3, NULL, MH_OPT_BOOL},
{"width", 1, NULL, MH_OPT_ARG, "number"},
{"reverse", 1, NULL, MH_OPT_BOOL},
{"file", 4, NULL, MH_OPT_ARG, "file"},
{"clear", 1, MH_OPT_BOOL},
{"form", 4, MH_OPT_ARG, "formatfile"},
{"format", 5, MH_OPT_ARG, "string"},
{"header", 3, MH_OPT_BOOL},
{"width", 1, MH_OPT_ARG, "number"},
{"reverse", 1, MH_OPT_BOOL},
{"file", 4, MH_OPT_ARG, "file"},
{ 0 }
};
......
......@@ -42,12 +42,12 @@ static struct argp_option options[] = {
/* Traditional MH options */
struct mh_option mh_option[] = {
{"draftfolder", 6, NULL, MH_OPT_ARG, "folder"},
{"nodraftfolder", 3, NULL, },
{"draftmessage", 6, NULL },
{"editor", 1, NULL, MH_OPT_ARG, "program"},
{"noedit", 3, NULL, },
{"prompt", 1, NULL },
{"draftfolder", 6, MH_OPT_ARG, "folder"},
{"nodraftfolder", 3, },
{"draftmessage", 6, },
{"editor", 1, MH_OPT_ARG, "program"},
{"noedit", 3, },
{"prompt", 1 },
{ 0 }
};
......