diff options
| author | kim <kim@pkgsrc.org> | 2000-05-20 18:41:36 +0000 |
|---|---|---|
| committer | kim <kim@pkgsrc.org> | 2000-05-20 18:41:36 +0000 |
| commit | 233c637b3fecbd43da2dd4291fbc9dffc049a9cd (patch) | |
| tree | 1842622d3486fa201791edfcc774c3b789c5af8a /mail/mutt/patches/patch-ac | |
| parent | 0800f709aef01d7356eb5f50ced4e0867604546a (diff) | |
| download | pkgsrc-233c637b3fecbd43da2dd4291fbc9dffc049a9cd.tar.gz | |
This is the version of the "& expansion in pw_gecos" fix that will be
in future versions of mutt.
Diffstat (limited to 'mail/mutt/patches/patch-ac')
| -rw-r--r-- | mail/mutt/patches/patch-ac | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/mail/mutt/patches/patch-ac b/mail/mutt/patches/patch-ac index 98dbb90221b..e463019fa76 100644 --- a/mail/mutt/patches/patch-ac +++ b/mail/mutt/patches/patch-ac @@ -1,10 +1,30 @@ -$NetBSD: patch-ac,v 1.1 2000/05/20 01:08:32 kim Exp $ +$NetBSD: patch-ac,v 1.2 2000/05/20 18:41:41 kim Exp $ ---- protos.h.orig Tue Mar 7 06:13:38 2000 -+++ protos.h Fri May 19 20:56:17 2000 -@@ -437,4 +437,4 @@ - void ci_bounce_message (HEADER *, int *); - int ci_send_message (int, HEADER *, char *, CONTEXT *, HEADER *); +--- init.c 2000/05/17 03:35:49 2.29 ++++ init.c 2000/05/20 07:30:46 +@@ -42,7 +42,6 @@ + #include "init.h" + #include "mailbox.h" -- -+char *mutt_expand_realname(char *, const char *); +-#include <pwd.h> + #include <ctype.h> + #include <stdlib.h> + #include <unistd.h> +@@ -1710,13 +1709,13 @@ + /* Get some information about the user */ + if ((pw = getpwuid (getuid ()))) + { ++ char rnbuf[STRING]; ++ + Username = safe_strdup (pw->pw_name); + if (!Homedir) + Homedir = safe_strdup (pw->pw_dir); +- if ((p = strchr (pw->pw_gecos, ','))) +- Realname = mutt_substrdup (pw->pw_gecos, p); +- else +- Realname = safe_strdup (pw->pw_gecos); ++ ++ Realname = safe_strdup (mutt_gecos_name (rnbuf, sizeof (rnbuf), pw)); + Shell = safe_strdup (pw->pw_shell); + } + else |