* 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-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>
 2008-02-29  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 
 	* mh/mh_ctx.c (mh_context_read): Allow for header continuation
 	* mh/mh_ctx.c (mh_context_read): Allow for header continuation

@@ -943,7 +943,7 @@ main (int argc, char **argv)
 
 
   /* If  folder  is invoked by a name ending with "s" (e.g.,  folders),
   /* If  folder  is invoked by a name ending with "s" (e.g.,  folders),
      `-all'  is  assumed */
      `-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;
     show_all = 1;
   
   
   if (has_folder)
   if (has_folder)

@@ -129,7 +129,7 @@ mh_argp_parse (int *pargc, char **pargv[],
   data.doc = argp_doc;
   data.doc = argp_doc;
   data.errind = -1;
   data.errind = -1;
   
   
-  val = mh_global_profile_get (program_invocation_short_name, NULL);
+  val = mh_global_profile_get (mu_program_name, NULL);
   if (val)
   if (val)
     {
     {
       int argc;
       int argc;

@@ -123,7 +123,7 @@ mh_help (struct mh_option *mh_opt, const char *doc)
   struct mh_option *p;
   struct mh_option *p;
 
 
   printf (_("Compatibility syntax:\n"));
   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"));
   printf (_("  switches are:\n"));
   
   
   for (p = mh_opt; p->opt; p++)
   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 ("  -version\n");
   printf (_("\nPlease use GNU long options instead.\n"
   printf (_("\nPlease use GNU long options instead.\n"
             "Run %s --help for more info on these.\n"),
             "Run %s --help for more info on these.\n"),
-            program_invocation_short_name);
+            mu_program_name);
 }
 }

@@ -402,7 +402,7 @@ mh_audit_open (char *name, mu_mailbox_t mbox)
   mu_mailbox_get_url (mbox, &url);
   mu_mailbox_get_url (mbox, &url);
   
   
   fprintf (fp, "<<%s>> %s %s\n",
   fprintf (fp, "<<%s>> %s %s\n",
-	   program_invocation_short_name,
+	   mu_program_name,
 	   date,
 	   date,
 	   mu_url_to_string (url));
 	   mu_url_to_string (url));
   return fp;
   return fp;

@@ -151,7 +151,7 @@ rmf (const char *name)
 	  else
 	  else
 	    {
 	    {
 	      printf ("%s: file `%s' not deleted, continuing...\n",
 	      printf ("%s: file `%s' not deleted, continuing...\n",
-		      program_invocation_short_name, p);
+		      mu_program_name, p);
 	      failures++;
 	      failures++;
 	    }
 	    }
 	}
 	}
@@ -171,7 +171,7 @@ rmf (const char *name)
     failures += rmdir (name);
     failures += rmdir (name);
   else
   else
     printf ("%s: folder `%s' not removed\n",
     printf ("%s: folder `%s' not removed\n",
-	    program_invocation_short_name, name);
+	    mu_program_name, name);
 
 
   if (failures == 0)
   if (failures == 0)
     {
     {