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[] = { ...@@ -55,16 +55,16 @@ static struct argp_option options[] = {
55 55
56 /* Traditional MH options */ 56 /* Traditional MH options */
57 struct mh_option mh_option[] = { 57 struct mh_option mh_option[] = {
58 {"build", 1, NULL, }, 58 {"build", 1, },
59 {"file", 2, NULL, MH_OPT_ARG, "draftfile"}, 59 {"file", 2, MH_OPT_ARG, "draftfile"},
60 {"form", 2, NULL, MH_OPT_ARG, "formatfile"}, 60 {"form", 2, MH_OPT_ARG, "formatfile"},
61 {"draftfolder", 6, NULL, MH_OPT_ARG, "folder"}, 61 {"draftfolder", 6, MH_OPT_ARG, "folder"},
62 {"nodraftfolder", 3, NULL }, 62 {"nodraftfolder", 3, },
63 {"draftmessage", 6, NULL }, 63 {"draftmessage", 6, },
64 {"editor", 1, NULL, MH_OPT_ARG, "program"}, 64 {"editor", 1, MH_OPT_ARG, "program"},
65 {"noedit", 3, NULL, }, 65 {"noedit", 3, },
66 {"whatnowproc", 2, NULL, MH_OPT_ARG, "program"}, 66 {"whatnowproc", 2, MH_OPT_ARG, "program"},
67 {"nowhatnowproc", 3, NULL }, 67 {"nowhatnowproc", 3, },
68 { 0 } 68 { 0 }
69 }; 69 };
70 70
......
1 /* GNU Mailutils -- a suite of utilities for electronic mail 1 /* GNU Mailutils -- a suite of utilities for electronic mail
2 Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. 2 Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
3 3
4 GNU Mailutils is free software; you can redistribute it and/or modify 4 GNU Mailutils is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 5 it under the terms of the GNU General Public License as published by
...@@ -35,8 +35,8 @@ static struct argp_option options[] = { ...@@ -35,8 +35,8 @@ static struct argp_option options[] = {
35 35
36 /* Traditional MH options */ 36 /* Traditional MH options */
37 struct mh_option mh_option[] = { 37 struct mh_option mh_option[] = {
38 {"form", 4, NULL, MH_OPT_ARG, "formatfile"}, 38 {"form", 4, MH_OPT_ARG, "formatfile"},
39 {"format", 5, NULL, MH_OPT_ARG, "string"}, 39 {"format", 5, MH_OPT_ARG, "string"},
40 { 0 } 40 { 0 }
41 }; 41 };
42 42
......
1 /* GNU Mailutils -- a suite of utilities for electronic mail 1 /* GNU Mailutils -- a suite of utilities for electronic mail
2 Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. 2 Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
3 3
4 GNU Mailutils is free software; you can redistribute it and/or modify 4 GNU Mailutils is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 5 it under the terms of the GNU General Public License as published by
...@@ -70,16 +70,16 @@ static struct argp_option options[] = { ...@@ -70,16 +70,16 @@ static struct argp_option options[] = {
70 70
71 /* Traditional MH options */ 71 /* Traditional MH options */
72 struct mh_option mh_option[] = { 72 struct mh_option mh_option[] = {
73 {"print", 2, NULL, 0, NULL }, 73 {"print", 2, 0, NULL },
74 {"list", 1, NULL, 0, NULL }, 74 {"list", 1, 0, NULL },
75 {"push", 2, NULL, 0, NULL }, 75 {"push", 2, 0, NULL },
76 {"pop", 2, NULL, 0, NULL }, 76 {"pop", 2, 0, NULL },
77 {"all", 1, NULL, 0, NULL }, 77 {"all", 1, 0, NULL },
78 {"create", 1, NULL, MH_OPT_BOOL, NULL}, 78 {"create", 1, MH_OPT_BOOL, NULL},
79 {"fast", 1, NULL, MH_OPT_BOOL, NULL}, 79 {"fast", 1, MH_OPT_BOOL, NULL},
80 {"header", 1, NULL, MH_OPT_BOOL, NULL}, 80 {"header", 1, MH_OPT_BOOL, NULL},
81 {"recurse", 1, NULL, MH_OPT_BOOL, NULL}, 81 {"recurse", 1, MH_OPT_BOOL, NULL},
82 {"total", 1, NULL, MH_OPT_BOOL, NULL}, 82 {"total", 1, MH_OPT_BOOL, NULL},
83 {NULL}, 83 {NULL},
84 }; 84 };
85 85
......
1 /* GNU Mailutils -- a suite of utilities for electronic mail 1 /* GNU Mailutils -- a suite of utilities for electronic mail
2 Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. 2 Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
3 3
4 GNU Mailutils is free software; you can redistribute it and/or modify 4 GNU Mailutils is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 5 it under the terms of the GNU General Public License as published by
...@@ -44,15 +44,15 @@ static struct argp_option options[] = { ...@@ -44,15 +44,15 @@ static struct argp_option options[] = {
44 44
45 /* Traditional MH options */ 45 /* Traditional MH options */
46 struct mh_option mh_option[] = { 46 struct mh_option mh_option[] = {
47 {"audit", 5, NULL, MH_OPT_ARG, "audit-file" }, 47 {"audit", 5, MH_OPT_ARG, "audit-file" },
48 {"noaudit", 3, NULL, 0, }, 48 {"noaudit", 3, 0, },
49 {"changecur", 1, NULL, MH_OPT_BOOL}, 49 {"changecur", 1, MH_OPT_BOOL},
50 {"file", 2, NULL, MH_OPT_ARG, "input-file"}, 50 {"file", 2, MH_OPT_ARG, "input-file"},
51 {"form", 4, NULL, MH_OPT_ARG, "format-file"}, 51 {"form", 4, MH_OPT_ARG, "format-file"},
52 {"format", 5, NULL, MH_OPT_ARG, "string"}, 52 {"format", 5, MH_OPT_ARG, "string"},
53 {"truncate", 2, NULL, MH_OPT_BOOL, }, 53 {"truncate", 2, MH_OPT_BOOL, },
54 {"width", 1, NULL, MH_OPT_ARG, "number"}, 54 {"width", 1, MH_OPT_ARG, "number"},
55 {"quiet", 1, NULL, 0, }, 55 {"quiet", 1, 0, },
56 { 0 } 56 { 0 }
57 }; 57 };
58 58
......
1 /* GNU Mailutils -- a suite of utilities for electronic mail 1 /* GNU Mailutils -- a suite of utilities for electronic mail
2 Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. 2 Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
3 3
4 GNU Mailutils is free software; you can redistribute it and/or modify 4 GNU Mailutils is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 5 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) ...@@ -68,7 +68,7 @@ mh_getopt (int argc, char **argv, struct mh_option *mh_opt, const char *doc)
68 68
69 if (p->opt) 69 if (p->opt)
70 { 70 {
71 char *longopt = p->longopt ? p->longopt : p->opt; 71 char *longopt = p->opt;
72 switch (p->flags) 72 switch (p->flags)
73 { 73 {
74 case MH_OPT_BOOL: 74 case MH_OPT_BOOL:
......
...@@ -25,7 +25,6 @@ struct mh_option ...@@ -25,7 +25,6 @@ struct mh_option
25 { 25 {
26 char *opt; 26 char *opt;
27 int match_len; 27 int match_len;
28 char *longopt;
29 int flags; 28 int flags;
30 char *arg; 29 char *arg;
31 }; 30 };
......
1 /* GNU Mailutils -- a suite of utilities for electronic mail 1 /* GNU Mailutils -- a suite of utilities for electronic mail
2 Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. 2 Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
3 3
4 GNU Mailutils is free software; you can redistribute it and/or modify 4 GNU Mailutils is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 5 it under the terms of the GNU General Public License as published by
...@@ -50,13 +50,13 @@ static struct argp_option options[] = { ...@@ -50,13 +50,13 @@ static struct argp_option options[] = {
50 50
51 /* Traditional MH options */ 51 /* Traditional MH options */
52 struct mh_option mh_option[] = { 52 struct mh_option mh_option[] = {
53 {"clear", 1, NULL, MH_OPT_BOOL}, 53 {"clear", 1, MH_OPT_BOOL},
54 {"form", 4, NULL, MH_OPT_ARG, "formatfile"}, 54 {"form", 4, MH_OPT_ARG, "formatfile"},
55 {"format", 5, NULL, MH_OPT_ARG, "string"}, 55 {"format", 5, MH_OPT_ARG, "string"},
56 {"header", 3, NULL, MH_OPT_BOOL}, 56 {"header", 3, MH_OPT_BOOL},
57 {"width", 1, NULL, MH_OPT_ARG, "number"}, 57 {"width", 1, MH_OPT_ARG, "number"},
58 {"reverse", 1, NULL, MH_OPT_BOOL}, 58 {"reverse", 1, MH_OPT_BOOL},
59 {"file", 4, NULL, MH_OPT_ARG, "file"}, 59 {"file", 4, MH_OPT_ARG, "file"},
60 { 0 } 60 { 0 }
61 }; 61 };
62 62
......
...@@ -42,12 +42,12 @@ static struct argp_option options[] = { ...@@ -42,12 +42,12 @@ static struct argp_option options[] = {
42 42
43 /* Traditional MH options */ 43 /* Traditional MH options */
44 struct mh_option mh_option[] = { 44 struct mh_option mh_option[] = {
45 {"draftfolder", 6, NULL, MH_OPT_ARG, "folder"}, 45 {"draftfolder", 6, MH_OPT_ARG, "folder"},
46 {"nodraftfolder", 3, NULL, }, 46 {"nodraftfolder", 3, },
47 {"draftmessage", 6, NULL }, 47 {"draftmessage", 6, },
48 {"editor", 1, NULL, MH_OPT_ARG, "program"}, 48 {"editor", 1, MH_OPT_ARG, "program"},
49 {"noedit", 3, NULL, }, 49 {"noedit", 3, },
50 {"prompt", 1, NULL }, 50 {"prompt", 1 },
51 { 0 } 51 { 0 }
52 }; 52 };
53 53
......