+1 -1

commands.c

reviewed

··· 879 879 880 880 void mutt_version (void) 881 881 { 882 882 - mutt_message ("Mutt " MUTT_VERSION " (%s)", ReleaseDate); 882 882 + mutt_message ("Mutt %s (%s)", MUTT_VERSION, ReleaseDate); 883 883 } 884 884 885 885 void mutt_edit_content_type (HEADER *h, BODY *b, FILE *fp)

+2 -1

compose.c

reviewed

··· 448 448 break; 449 449 450 450 case 'v': 451 451 - strfcpy(buf, "Mutt " MUTT_VERSION, buflen); 451 451 + snprintf (fmt, sizeof (fmt), "Mutt %%s"); 452 452 + snprintf (buf, buflen, fmt, MUTT_VERSION); 452 453 break; 453 454 454 455 case 0:

+1 -1

dotlock.c

reviewed

··· 339 339 static void 340 340 usage (const char *av0) 341 341 { 342 342 - fprintf (stderr, "dotlock [Mutt " MUTT_VERSION " (%s)]\n", ReleaseDate); 342 342 + fprintf (stderr, "dotlock [Mutt %s (%s)]\n", MUTT_VERSION, ReleaseDate); 343 343 fprintf (stderr, "usage: %s [-t|-f|-u|-d] [-p] [-r <retries>] file\n", 344 344 av0); 345 345

+11 -11

init.c

reviewed

··· 2851 2851 if ((debugfile = safe_fopen(buf, "w")) != NULL) 2852 2852 { 2853 2853 setbuf (debugfile, NULL); /* don't buffer the debugging output! */ 2854 2854 - dprint(1,(debugfile,"Mutt/" MUTT_VERSION " (%s) debugging at level %d\n", 2855 2855 - ReleaseDate, debuglevel)); 2854 2854 + dprint(1,(debugfile,"Mutt/%s (%s) debugging at level %d\n", 2855 2855 + MUTT_VERSION, ReleaseDate, debuglevel)); 2856 2856 } 2857 2857 } 2858 2858 #endif ··· 2901 2901 2902 2902 static char* mutt_find_cfg (const char *home, const char *xdg_cfg_home) 2903 2903 { 2904 2904 - const char* names[] = 2904 2904 + const char* names[][2] = 2905 2905 { 2906 2906 - "muttrc-" MUTT_VERSION, 2907 2907 - "muttrc", 2908 2908 - NULL, 2906 2906 + { "muttrc", "-" MUTT_VERSION }, 2907 2907 + { "muttrc", "" }, 2908 2908 + { NULL, NULL }, 2909 2909 }; 2910 2910 2911 2911 const char* locations[][2] = ··· 2925 2925 if (!locations[i][0]) 2926 2926 continue; 2927 2927 2928 2928 - for (j = 0; names[j]; j++) 2928 2928 + for (j = 0; names[j][0]; j++) 2929 2929 { 2930 2930 char buffer[STRING]; 2931 2931 2932 2932 - snprintf (buffer, sizeof (buffer), 2933 2933 - "%s/%s%s", locations[i][0], locations[i][1], names[j]); 2932 2932 + snprintf (buffer, sizeof (buffer), "%s/%s%s%s", 2933 2933 + locations[i][0], locations[i][1], names[j][0], names[j][1]); 2934 2934 if (access (buffer, F_OK) == 0) 2935 2935 return safe_strdup(buffer); 2936 2936 } ··· 3198 3198 requested not to via "-n". */ 3199 3199 if (!skip_sys_rc) 3200 3200 { 3201 3201 - snprintf (buffer, sizeof(buffer), "%s/Muttrc-" MUTT_VERSION, SYSCONFDIR); 3201 3201 + snprintf (buffer, sizeof(buffer), "%s/Muttrc-%s", SYSCONFDIR, MUTT_VERSION); 3202 3202 if (access (buffer, F_OK) == -1) 3203 3203 snprintf (buffer, sizeof(buffer), "%s/Muttrc", SYSCONFDIR); 3204 3204 if (access (buffer, F_OK) == -1) 3205 3205 - snprintf (buffer, sizeof (buffer), "%s/Muttrc-" MUTT_VERSION, PKGDATADIR); 3205 3205 + snprintf (buffer, sizeof (buffer), "%s/Muttrc-%s", PKGDATADIR, MUTT_VERSION); 3206 3206 if (access (buffer, F_OK) == -1) 3207 3207 snprintf (buffer, sizeof (buffer), "%s/Muttrc", PKGDATADIR); 3208 3208 if (access (buffer, F_OK) != -1)

+2 -2

muttlib.c

reviewed

··· 1850 1850 const char *mutt_make_version (void) 1851 1851 { 1852 1852 static char vstring[STRING]; 1853 1853 - snprintf (vstring, sizeof (vstring), "Mutt " MUTT_VERSION " (%s)", 1854 1854 - ReleaseDate); 1853 1853 + snprintf (vstring, sizeof (vstring), "Mutt %s (%s)", 1854 1854 + MUTT_VERSION, ReleaseDate); 1855 1855 return vstring; 1856 1856 } 1857 1857

+2 -1

status.c

reviewed

··· 272 272 break; 273 273 274 274 case 'v': 275 275 - strfcpy (buf, "Mutt " MUTT_VERSION, buflen); 275 275 + snprintf (fmt, sizeof (fmt), "Mutt %%s"); 276 276 + snprintf (buf, buflen, fmt, MUTT_VERSION); 276 277 break; 277 278 278 279 case 'V':