mutt-home_etc2.patch

   1 diff -Nru mutt-1.4.1.orig/doc/mutt.man mutt-1.4.1/doc/mutt.man
   2 --- mutt-1.4.1.orig/doc/mutt.man        Wed Jul 24 10:41:31 2002
   3 +++ mutt-1.4.1/doc/mutt.man     Wed Oct  8 20:11:11 2003
   4 @@ -122,13 +122,13 @@
   5  Specifies the editor to use when composing messages.
   6  .SH FILES
   7  .PP
   8 -.IP "~/.muttrc or ~/.mutt/muttrc"
   9 +.IP "$HOME_ETC/.muttrc" or "$HOME_ETC/.mutt/muttrc" or "~/.muttrc" or "~/.mutt/muttrc"
  10  User configuration file.
  11  .IP "/etc/Muttrc"
  12  System-wide configuration file.
  13  .IP "/tmp/muttXXXXXX"
  14  Temporary files created by Mutt.
  15 -.IP "~/.mailcap"
  16 +.IP "$HOME_ETC/.mailcap" or "~/.mailcap"
  17  User definition for handling non-text MIME types.
  18  .IP "/etc/mailcap"
  19  System definition for handling non-text MIME types.
  20 diff -Nru mutt-1.4.1.orig/init.c mutt-1.4.1/init.c
  21 --- mutt-1.4.1.orig/init.c      Wed Oct  8 19:33:11 2003
  22 +++ mutt-1.4.1/init.c   Wed Oct  8 20:10:37 2003
  23 @@ -1811,6 +1811,12 @@
  24    else
  25    {
  26      /* Default search path from RFC1524 */
  27 +               if (getenv("HOME_ETC")) {
  28 +                       char buf[STRING];
  29 +
  30 +                       snprintf(buf, sizeof(buf), "%s/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR "/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap", getenv("HOME_ETC"));
  31 +                       MailcapPath = safe_strdup (buf);
  32 +               } else
  33      MailcapPath = safe_strdup ("~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR "/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap");
  34    }
  35
  36 @@ -1892,18 +1898,38 @@
  37
  38    if (!Muttrc)
  39    {
  40 +               for (;;) {
  41      snprintf (buffer, sizeof(buffer), "%s/%s/muttrc-%s", NONULL(Homedir), getenv ("CONFIG_DIR"), MUTT_VERSION);
  42      if (access(buffer, F_OK) == -1)
  43        snprintf (buffer, sizeof(buffer), "%s/%s/muttrc", NONULL(Homedir), getenv ("CONFIG_DIR"));
  44 -    if (access(buffer, F_OK) == -1)
  45 -      snprintf (buffer, sizeof(buffer), "%s/.muttrc-%s", NONULL(Homedir), MUTT_VERSION);
  46 -    if (access(buffer, F_OK) == -1)
  47 -      snprintf (buffer, sizeof(buffer), "%s/.muttrc", NONULL(Homedir));
  48 -    if (access(buffer, F_OK) == -1)
  49 -      snprintf (buffer, sizeof (buffer), "%s/.mutt/muttrc-%s", NONULL(Homedir), MUTT_VERSION);
  50 -    if (access(buffer, F_OK) == -1)
  51 -      snprintf (buffer, sizeof (buffer), "%s/.mutt/muttrc", NONULL(Homedir));
  52 -
  53 +      else break;
  54 +    if (getenv("HOME_ETC")) {
  55 +      if (access(buffer, F_OK) == -1)
  56 +        snprintf(buffer, sizeof(buffer), "%s/.muttrc-%s", getenv("HOME_ETC"), MUTT_VERSION);
  57 +        else break;
  58 +      if (access(buffer, F_OK) == -1)
  59 +        snprintf (buffer, sizeof(buffer), "%s/.muttrc", getenv("HOME_ETC"));
  60 +        else break;
  61 +      if (access(buffer, F_OK) == -1)
  62 +        snprintf (buffer, sizeof (buffer), "%s/.mutt/muttrc-%s", getenv("HOME_ETC"), MUTT_VERSION);
  63 +        else break;
  64 +      if (access(buffer, F_OK) == -1)
  65 +        snprintf (buffer, sizeof (buffer), "%s/.mutt/muttrc", getenv("HOME_ETC"));
  66 +               } else {
  67 +                 if (access(buffer, F_OK) == -1)
  68 +        snprintf (buffer, sizeof(buffer), "%s/.muttrc-%s", NONULL(Homedir), MUTT_VERSION);
  69 +        else break;
  70 +      if (access(buffer, F_OK) == -1)
  71 +        snprintf (buffer, sizeof(buffer), "%s/.muttrc", NONULL(Homedir));
  72 +        else break;
  73 +      if (access(buffer, F_OK) == -1)
  74 +        snprintf (buffer, sizeof (buffer), "%s/.mutt/muttrc-%s", NONULL(Homedir), MUTT_VERSION);
  75 +        else break;
  76 +      if (access(buffer, F_OK) == -1)
  77 +        snprintf (buffer, sizeof (buffer), "%s/.mutt/muttrc", NONULL(Homedir));
  78 +    }
  79 +    break;
  80 +  }
  81      default_rc = 1;
  82      Muttrc = safe_strdup (buffer);
  83    }
  84 diff -Nru mutt-1.4.1.orig/muttbug.sh.in mutt-1.4.1/muttbug.sh.in
  85 --- mutt-1.4.1.orig/muttbug.sh.in       Wed Oct  8 19:33:11 2003
  86 +++ mutt-1.4.1/muttbug.sh.in    Wed Oct  8 20:19:05 2003
  87 @@ -244,13 +244,21 @@
  88  if test "$personal" = "yes" ; then
  89         CANDIDATES=".muttrc-${MUTTVERSION} .muttrc .mutt/muttrc-${MUTTVERSION} .mutt/muttrc"
  90         MATCHED="none"
  91 +       if test -n "$HOME_ETC" ; then
  92 +               for f in $CANDIDATES; do
  93 +                       if test -f "${HOME_ETC}/$f" ; then
  94 +                               MATCHED="${HOME_ETC}/$f"
  95 +                               break
  96 +           fi
  97 +               done
  98 +       else
  99         for f in $CANDIDATES; do
 100                 if test -f "${HOME}/$f" ; then
 101                         MATCHED="${HOME}/$f"
 102                         break
 103                 fi
 104         done
 105 -
 106 +       fi
 107         if test "$MATCHED" = "none" ; then
 108                 echo "Warning: Can't find your personal .muttrc." >&2
 109         else
 110 diff -Nru mutt-1.4.1.orig/sendlib.c mutt-1.4.1/sendlib.c
 111 --- mutt-1.4.1.orig/sendlib.c   Wed Oct  8 19:33:11 2003
 112 +++ mutt-1.4.1/sendlib.c        Wed Oct  8 19:57:55 2003
 113 @@ -958,7 +958,8 @@
 114
 115  /* Given a file with path ``s'', see if there is a registered MIME type.
 116   * returns the major MIME type, and copies the subtype to ``d''.  First look
 117 - * for ~/.mime.types, then look in a system mime.types if we can find one.
 118 + * for either $HOME_ETC/.mime.types or ~/.mime.types, then look in a system
 119 + * mime.types if we can find one.
 120   * The longest match is used so that we can match `ps.gz' when `gz' also
 121   * exists.
 122   */
 123 @@ -989,7 +990,9 @@
 124      switch (count)
 125      {
 126        case 0:
 127 -       snprintf (buf, sizeof (buf), "%s/.mime.types", NONULL(Homedir));
 128 +       if (getenv("HOME_ETC"))
 129 +               snprintf (buf, sizeof (buf), "%s/.mime.types", getenv("HOME_ETC"));
 130 +       else snprintf (buf, sizeof (buf), "%s/.mime.types", NONULL(Homedir));
 131         break;
 132        case 1:
 133         strfcpy (buf, SYSCONFDIR"/mime.types", sizeof(buf));