Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit d43f6f1f d43f6f1f1a8554ae53ec5f90bb3956b3d94e24f2 by Sergey Poznyakoff
Options

Removed argp_program_bug_address. Use PACKAGE_STRING, provided by the new autoconf.

1 parent e4e18a70
Inline Side-by-side
Showing 14 changed files with 18 additions and 32 deletions
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
17 17
18 #include "comsat.h" 18 #include "comsat.h"
19 19
20 #define IMPL "GNU Comsat Daemon"
21
22 #ifndef PATH_DEV 20 #ifndef PATH_DEV
23 # define PATH_DEV "/dev" 21 # define PATH_DEV "/dev"
24 #endif 22 #endif
...@@ -53,8 +51,7 @@ typedef struct utmp UTMP; ...@@ -53,8 +51,7 @@ typedef struct utmp UTMP;
53 51
54 #define MAX_TTY_SIZE (sizeof (PATH_TTY_PFX) + sizeof (((UTMP*)0)->ut_line)) 52 #define MAX_TTY_SIZE (sizeof (PATH_TTY_PFX) + sizeof (((UTMP*)0)->ut_line))
55 53
56 const char *argp_program_version = "comsatd (" PACKAGE ") " VERSION; 54 const char *argp_program_version = "comsatd (" PACKAGE_STRING ")";
57 const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
58 static char doc[] = "GNU comsatd"; 55 static char doc[] = "GNU comsatd";
59 56
60 static struct argp_option options[] = 57 static struct argp_option options[] =
......
...@@ -30,8 +30,7 @@ ...@@ -30,8 +30,7 @@
30 #include <mailutils/errno.h> 30 #include <mailutils/errno.h>
31 #include <mailutils/locker.h> 31 #include <mailutils/locker.h>
32 32
33 const char *argp_program_version = "GNU dotlock (" PACKAGE ") " VERSION; 33 const char *argp_program_version = "GNU dotlock (" PACKAGE_STRING ")";
34 const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
35 static char doc[] = 34 static char doc[] =
36 "GNU dotlock -- lock mail spool files" 35 "GNU dotlock -- lock mail spool files"
37 "\v" 36 "\v"
......
...@@ -59,8 +59,7 @@ static int selected; ...@@ -59,8 +59,7 @@ static int selected;
59 59
60 static int action (observer_t, size_t); 60 static int action (observer_t, size_t);
61 61
62 const char *argp_program_version = "frm (" PACKAGE ") " VERSION; 62 const char *argp_program_version = "frm (" PACKAGE_STRING ")";
63 const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
64 static char doc[] = "GNU frm -- display From: lines"; 63 static char doc[] = "GNU frm -- display From: lines";
65 64
66 static struct argp_option options[] = { 65 static struct argp_option options[] = {
......
...@@ -44,8 +44,7 @@ ...@@ -44,8 +44,7 @@
44 #include <mailutils/registrar.h> 44 #include <mailutils/registrar.h>
45 #include <mailutils/stream.h> 45 #include <mailutils/stream.h>
46 46
47 const char *argp_program_version = "from (" PACKAGE ") " VERSION; 47 const char *argp_program_version = "from (" PACKAGE_STRING ")";
48 const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
49 static char doc[] = "GNU from -- display from and subject"; 48 static char doc[] = "GNU from -- display from and subject";
50 49
51 static struct argp_option options[] = { 50 static struct argp_option options[] = {
......
...@@ -118,10 +118,9 @@ parse_opt (int key, char *arg, struct argp_state *state) ...@@ -118,10 +118,9 @@ parse_opt (int key, char *arg, struct argp_state *state)
118 return 0; 118 return 0;
119 } 119 }
120 120
121 const char *argp_program_version = "guimb (" PACKAGE ") " VERSION; 121 const char *argp_program_version = "guimb (" PACKAGE_STRING ")";
122 const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
123 static char doc[] = 122 static char doc[] =
124 "GNU messages -- Process the contents of the specified mailboxes\n" 123 "GNU guimb -- Process the contents of the specified mailboxes\n"
125 "using a Scheme program or expression."; 124 "using a Scheme program or expression.";
126 static char args_doc[] = "[mailbox...]"; 125 static char args_doc[] = "[mailbox...]";
127 126
......
...@@ -38,8 +38,7 @@ struct daemon_param daemon_param = { ...@@ -38,8 +38,7 @@ struct daemon_param daemon_param = {
38 /* Number of child processes. */ 38 /* Number of child processes. */
39 volatile size_t children; 39 volatile size_t children;
40 40
41 const char *argp_program_version = "imap4d (" PACKAGE ") " VERSION; 41 const char *argp_program_version = "imap4d (" PACKAGE_STRING ")";
42 const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
43 static char doc[] = "GNU imap4d -- the IMAP4D daemon"; 42 static char doc[] = "GNU imap4d -- the IMAP4D daemon";
44 43
45 static struct argp_option options[] = 44 static struct argp_option options[] =
......
...@@ -36,8 +36,7 @@ void guess_retval (int ec); ...@@ -36,8 +36,7 @@ void guess_retval (int ec);
36 void mailer_err (char *fmt, ...); 36 void mailer_err (char *fmt, ...);
37 void notify_biff (mailbox_t mbox, char *name, size_t size); 37 void notify_biff (mailbox_t mbox, char *name, size_t size);
38 38
39 const char *argp_program_version = "mail.local (" PACKAGE ") " VERSION; 39 const char *argp_program_version = "mail.local (" PACKAGE_STRING ")";
40 const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
41 static char doc[] = "GNU mail.local -- the local MDA"; 40 static char doc[] = "GNU mail.local -- the local MDA";
42 static char args_doc[] = "recipient [recipient ...]"; 41 static char args_doc[] = "recipient [recipient ...]";
43 42
......
...@@ -39,8 +39,7 @@ ...@@ -39,8 +39,7 @@
39 #include <mailutils/registrar.h> 39 #include <mailutils/registrar.h>
40 #include <mailutils/stream.h> 40 #include <mailutils/stream.h>
41 41
42 const char *argp_program_version = "mail.remote (" PACKAGE ") " VERSION; 42 const char *argp_program_version = "mail.remote (" PACKAGE_STRING ")";
43 const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
44 static char doc[] = 43 static char doc[] =
45 "GNU mail.remote -- pseudo-sendmail interface for mail delivery\n" 44 "GNU mail.remote -- pseudo-sendmail interface for mail delivery\n"
46 "\v" 45 "\v"
......
...@@ -25,8 +25,7 @@ size_t total; ...@@ -25,8 +25,7 @@ size_t total;
25 FILE *ofile; 25 FILE *ofile;
26 int interactive; 26 int interactive;
27 27
28 const char *argp_program_version = "mail (" PACKAGE ") " VERSION; 28 const char *argp_program_version = "mail (" PACKAGE_STRING ")";
29 const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
30 static char doc[] = "GNU mail -- the standard /bin/mail interface"; 29 static char doc[] = "GNU mail -- the standard /bin/mail interface";
31 static char args_doc[] = "[address...]"; 30 static char args_doc[] = "[address...]";
32 31
...@@ -354,8 +353,9 @@ main (int argc, char **argv) ...@@ -354,8 +353,9 @@ main (int argc, char **argv)
354 "%s, Copyright (C) 2001 Free Software Foundation, Inc.\n" 353 "%s, Copyright (C) 2001 Free Software Foundation, Inc.\n"
355 "mail is free software with ABSOLUTELY NO WARRANTY.\n" 354 "mail is free software with ABSOLUTELY NO WARRANTY.\n"
356 "For details type `warranty'.\n" 355 "For details type `warranty'.\n"
357 "Send bug reports to <bug-mailutils@gnu.org>.\n", 356 "Send bug reports to %s.\n",
358 argp_program_version); 357 argp_program_version,
358 argp_program_bug_address);
359 } 359 }
360 360
361 ml_readline_init (); 361 ml_readline_init ();
......
...@@ -30,8 +30,7 @@ ...@@ -30,8 +30,7 @@
30 30
31 static int messages_count (const char *); 31 static int messages_count (const char *);
32 32
33 const char *argp_program_version = "messages (" PACKAGE ") " VERSION; 33 const char *argp_program_version = "messages (" PACKAGE_STRING ")";
34 const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
35 static char doc[] = "GNU messages -- count the number of messages in a mailbox"; 34 static char doc[] = "GNU messages -- count the number of messages in a mailbox";
36 static char args_doc[] = "[mailbox...]"; 35 static char args_doc[] = "[mailbox...]";
37 36
......
...@@ -19,8 +19,7 @@ ...@@ -19,8 +19,7 @@
19 19
20 #include <mh.h> 20 #include <mh.h>
21 21
22 const char *argp_program_version = "inc (" PACKAGE ") " VERSION; 22 const char *argp_program_version = "inc (" PACKAGE_STRING ")";
23 const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
24 static char doc[] = "GNU MH inc"; 23 static char doc[] = "GNU MH inc";
25 static char args_doc[] = ""; 24 static char args_doc[] = "";
26 25
......
...@@ -25,8 +25,7 @@ ...@@ -25,8 +25,7 @@
25 #include <sys/stat.h> 25 #include <sys/stat.h>
26 #include <time.h> 26 #include <time.h>
27 27
28 const char *argp_program_version = "scan (" PACKAGE ") " VERSION; 28 const char *argp_program_version = "scan (" PACKAGE_STRING ")";
29 const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
30 static char doc[] = "GNU MH scan"; 29 static char doc[] = "GNU MH scan";
31 static char args_doc[] = ""; 30 static char args_doc[] = "";
32 31
......
...@@ -45,7 +45,7 @@ pop3d_capa (const char *arg) ...@@ -45,7 +45,7 @@ pop3d_capa (const char *arg)
45 message. */ 45 message. */
46 /*pop3d_outf ("EXPIRE NEVER\r\n"); */ 46 /*pop3d_outf ("EXPIRE NEVER\r\n"); */
47 if (state == TRANSACTION) /* let's not advertise to just anyone */ 47 if (state == TRANSACTION) /* let's not advertise to just anyone */
48 pop3d_outf ("IMPLEMENTATION %s %s\r\n", IMPL, VERSION); 48 pop3d_outf ("IMPLEMENTATION %s\r\n", PACKAGE_STRING);
49 pop3d_outf (".\r\n"); 49 pop3d_outf (".\r\n");
50 return OK; 50 return OK;
51 } 51 }
......
...@@ -51,8 +51,7 @@ sieve script interpreter. ...@@ -51,8 +51,7 @@ sieve script interpreter.
51 51
52 void mutil_register_all_mbox_formats(void); 52 void mutil_register_all_mbox_formats(void);
53 53
54 const char *argp_program_version = "sieve (" PACKAGE ") " VERSION; 54 const char *argp_program_version = "sieve (" PACKAGE_STRING ")";
55 const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
56 55
57 static char doc[] = 56 static char doc[] =
58 "GNU sieve -- a mail filtering tool\n" 57 "GNU sieve -- a mail filtering tool\n"
......