summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--mh/folder.c2
-rw-r--r--mh/mh_argp.c2
-rw-r--r--mh/mh_getopt.c4
-rw-r--r--mh/mh_init.c2
-rw-r--r--mh/rmf.c4
6 files changed, 13 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ff37d2d9..a030805c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-01 Sergey Poznyakoff <gray@gnu.org.ua>
+
+ * mh/folder.c, mh/mh_argp.c, mh/mh_getopt.c, mh/mh_init.c,
+ mh/rmf.c: Use mu_program_name instead of
+ program_invocation_short_name.
+
2008-02-29 Sergey Poznyakoff <gray@gnu.org.ua>
* mh/mh_ctx.c (mh_context_read): Allow for header continuation
diff --git a/mh/folder.c b/mh/folder.c
index 72f86f5b7..9a20f69e4 100644
--- a/mh/folder.c
+++ b/mh/folder.c
@@ -943,7 +943,7 @@ main (int argc, char **argv)
/* If folder is invoked by a name ending with "s" (e.g., folders),
`-all' is assumed */
- if (program_invocation_short_name[strlen (program_invocation_short_name) - 1] == 's')
+ if (mu_program_name[strlen (mu_program_name) - 1] == 's')
show_all = 1;
if (has_folder)
diff --git a/mh/mh_argp.c b/mh/mh_argp.c
index cce1b7668..1144ed514 100644
--- a/mh/mh_argp.c
+++ b/mh/mh_argp.c
@@ -129,7 +129,7 @@ mh_argp_parse (int *pargc, char **pargv[],
data.doc = argp_doc;
data.errind = -1;
- val = mh_global_profile_get (program_invocation_short_name, NULL);
+ val = mh_global_profile_get (mu_program_name, NULL);
if (val)
{
int argc;
diff --git a/mh/mh_getopt.c b/mh/mh_getopt.c
index 439dfd793..4c9767ade 100644
--- a/mh/mh_getopt.c
+++ b/mh/mh_getopt.c
@@ -123,7 +123,7 @@ mh_help (struct mh_option *mh_opt, const char *doc)
struct mh_option *p;
printf (_("Compatibility syntax:\n"));
- printf (_("%s [switches] %s\n"), program_invocation_short_name, doc);
+ printf (_("%s [switches] %s\n"), mu_program_name, doc);
printf (_(" switches are:\n"));
for (p = mh_opt; p->opt; p++)
@@ -148,5 +148,5 @@ mh_help (struct mh_option *mh_opt, const char *doc)
printf (" -version\n");
printf (_("\nPlease use GNU long options instead.\n"
"Run %s --help for more info on these.\n"),
- program_invocation_short_name);
+ mu_program_name);
}
diff --git a/mh/mh_init.c b/mh/mh_init.c
index b92ab1dbc..6f9635ad4 100644
--- a/mh/mh_init.c
+++ b/mh/mh_init.c
@@ -402,7 +402,7 @@ mh_audit_open (char *name, mu_mailbox_t mbox)
mu_mailbox_get_url (mbox, &url);
fprintf (fp, "<<%s>> %s %s\n",
- program_invocation_short_name,
+ mu_program_name,
date,
mu_url_to_string (url));
return fp;
diff --git a/mh/rmf.c b/mh/rmf.c
index 95467519e..806e9c742 100644
--- a/mh/rmf.c
+++ b/mh/rmf.c
@@ -151,7 +151,7 @@ rmf (const char *name)
else
{
printf ("%s: file `%s' not deleted, continuing...\n",
- program_invocation_short_name, p);
+ mu_program_name, p);
failures++;
}
}
@@ -171,7 +171,7 @@ rmf (const char *name)
failures += rmdir (name);
else
printf ("%s: folder `%s' not removed\n",
- program_invocation_short_name, name);
+ mu_program_name, name);
if (failures == 0)
{

Return to:

Send suggestions and report system problems to the System administrator.