projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplifications
[apps/madmutt.git]
/
init.c
diff --git
a/init.c
b/init.c
index
5ad2e22
..
69de16b
100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-29,7
+29,7
@@
#include "mbyte.h"
#include "charset.h"
#include "thread.h"
#include "mbyte.h"
#include "charset.h"
#include "thread.h"
-#include
"mutt_crypt.h"
+#include
<lib-crypt/crypt.h>
#include "mutt_idna.h"
#if defined(USE_SSL) || defined(USE_GNUTLS)
#include "mutt_idna.h"
#if defined(USE_SSL) || defined(USE_GNUTLS)
@@
-263,15
+263,15
@@
static void sys_to_string (char* dst, size_t dstlen,
char *val = NULL, *t = NULL;
int clean = 0;
char *val = NULL, *t = NULL;
int clean = 0;
- /* get some $m
uttng
_ values dynamically */
- if (ascii_strcmp ("m
uttng
_pwd", option->option) == 0) {
+ /* get some $m
admutt
_ values dynamically */
+ if (ascii_strcmp ("m
admutt
_pwd", option->option) == 0) {
val = p_new(char, _POSIX_PATH_MAX);
val = getcwd (val, _POSIX_PATH_MAX-1);
clean = 1;
val = p_new(char, _POSIX_PATH_MAX);
val = getcwd (val, _POSIX_PATH_MAX-1);
clean = 1;
- } else if (ascii_strcmp ("m
uttng
_folder_path", option->option) == 0 &&
+ } else if (ascii_strcmp ("m
admutt
_folder_path", option->option) == 0 &&
CurrentFolder && *CurrentFolder) {
val = CurrentFolder;
CurrentFolder && *CurrentFolder) {
val = CurrentFolder;
- } else if (ascii_strcmp ("m
uttng
_folder_name", option->option) == 0 &&
+ } else if (ascii_strcmp ("m
admutt
_folder_name", option->option) == 0 &&
CurrentFolder && *CurrentFolder) {
ssize_t Maildirlength = m_strlen(Maildir);
CurrentFolder && *CurrentFolder) {
ssize_t Maildirlength = m_strlen(Maildir);
@@
-2006,7
+2006,7
@@
static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
break;
}
break;
}
- /* the $m
uttng
_ variables are read-only */
+ /* the $m
admutt
_ variables are read-only */
if (!FuncTable[DTYPE (option->type)].opt_from_string) {
snprintf (err->data, err->dsize, _("$%s is read-only"),
option->option);
if (!FuncTable[DTYPE (option->type)].opt_from_string) {
snprintf (err->data, err->dsize, _("$%s is read-only"),
option->option);
@@
-2640,15
+2640,12
@@
void mutt_init (int skip_sys_rc, LIST * commands)
else
Hostname = m_strdup(utsname.nodename);
else
Hostname = m_strdup(utsname.nodename);
-#ifndef DOMAIN
-#define DOMAIN buffer
if (!p && getdnsdomainname (buffer, sizeof(buffer)) == -1)
Fqdn = m_strdup("@");
else
if (!p && getdnsdomainname (buffer, sizeof(buffer)) == -1)
Fqdn = m_strdup("@");
else
-#endif /* DOMAIN */
- if (*DOMAIN != '@') {
- Fqdn = p_new(char, m_strlen(DOMAIN) + m_strlen(Hostname) + 2);
- sprintf (Fqdn, "%s.%s", NONULL (Hostname), DOMAIN); /* __SPRINTF_CHECKED__ */
+ if (*buffer != '@') {
+ Fqdn = p_new(char, m_strlen(buffer) + m_strlen(Hostname) + 2);
+ sprintf (Fqdn, "%s.%s", NONULL(Hostname), buffer); /* __SPRINTF_CHECKED__ */
}
else
Fqdn = m_strdup(NONULL (Hostname));
}
else
Fqdn = m_strdup(NONULL (Hostname));
@@
-2705,7
+2702,6
@@
void mutt_init (int skip_sys_rc, LIST * commands)
p = "vi";
}
Editor = m_strdup(p);
p = "vi";
}
Editor = m_strdup(p);
- Visual = m_strdup(p);
if ((p = getenv ("REPLYTO")) != NULL) {
BUFFER buf, token;
if ((p = getenv ("REPLYTO")) != NULL) {
BUFFER buf, token;
@@
-2734,14
+2730,11
@@
void mutt_init (int skip_sys_rc, LIST * commands)
CurrentMenu = MENU_MAIN;
CurrentMenu = MENU_MAIN;
-
-#ifndef LOCALES_HACK
/* Do we have a locale definition? */
if (((p = getenv ("LC_ALL")) != NULL && p[0]) ||
((p = getenv ("LANG")) != NULL && p[0]) ||
((p = getenv ("LC_CTYPE")) != NULL && p[0]))
set_option (OPTLOCALES);
/* Do we have a locale definition? */
if (((p = getenv ("LC_ALL")) != NULL && p[0]) ||
((p = getenv ("LANG")) != NULL && p[0]) ||
((p = getenv ("LC_CTYPE")) != NULL && p[0]))
set_option (OPTLOCALES);
-#endif
#ifdef HAVE_GETSID
/* Unset suspend by default if we're the session leader */
#ifdef HAVE_GETSID
/* Unset suspend by default if we're the session leader */
@@
-2769,18
+2762,18
@@
void mutt_init (int skip_sys_rc, LIST * commands)
if (!Muttrc) {
#if 0
if (!Muttrc) {
#if 0
- snprintf (buffer, sizeof(buffer), "%s/.m
uttng
rc-%s", NONULL (Homedir),
+ snprintf (buffer, sizeof(buffer), "%s/.m
admutt
rc-%s", NONULL (Homedir),
MUTT_VERSION);
if (access (buffer, F_OK) == -1)
#endif
MUTT_VERSION);
if (access (buffer, F_OK) == -1)
#endif
- snprintf (buffer, sizeof(buffer), "%s/.m
uttng
rc", NONULL (Homedir));
+ snprintf (buffer, sizeof(buffer), "%s/.m
admutt
rc", NONULL (Homedir));
if (access (buffer, F_OK) == -1)
#if 0
if (access (buffer, F_OK) == -1)
#if 0
- snprintf (buffer, sizeof(buffer), "%s/.m
uttng/muttng
rc-%s",
+ snprintf (buffer, sizeof(buffer), "%s/.m
admutt/madmutt
rc-%s",
NONULL (Homedir), MUTT_VERSION);
if (access (buffer, F_OK) == -1)
#endif
NONULL (Homedir), MUTT_VERSION);
if (access (buffer, F_OK) == -1)
#endif
- snprintf (buffer, sizeof(buffer), "%s/.m
uttng/muttng
rc",
+ snprintf (buffer, sizeof(buffer), "%s/.m
admutt/madmutt
rc",
NONULL (Homedir));
default_rc = 1;
NONULL (Homedir));
default_rc = 1;
@@
-2798,15
+2791,15
@@
void mutt_init (int skip_sys_rc, LIST * commands)
/* Process the global rc file if it exists and the user hasn't explicity
requested not to via "-n". */
if (!skip_sys_rc) {
/* Process the global rc file if it exists and the user hasn't explicity
requested not to via "-n". */
if (!skip_sys_rc) {
- snprintf (buffer, sizeof(buffer), "%s/M
uttng
rc-%s", SYSCONFDIR,
+ snprintf (buffer, sizeof(buffer), "%s/M
admutt
rc-%s", SYSCONFDIR,
MUTT_VERSION);
if (access (buffer, F_OK) == -1)
MUTT_VERSION);
if (access (buffer, F_OK) == -1)
- snprintf (buffer, sizeof(buffer), "%s/M
uttng
rc", SYSCONFDIR);
+ snprintf (buffer, sizeof(buffer), "%s/M
admutt
rc", SYSCONFDIR);
if (access (buffer, F_OK) == -1)
if (access (buffer, F_OK) == -1)
- snprintf (buffer, sizeof(buffer), "%s/M
uttng
rc-%s", PKGDATADIR,
+ snprintf (buffer, sizeof(buffer), "%s/M
admutt
rc-%s", PKGDATADIR,
MUTT_VERSION);
if (access (buffer, F_OK) == -1)
MUTT_VERSION);
if (access (buffer, F_OK) == -1)
- snprintf (buffer, sizeof(buffer), "%s/M
uttng
rc", PKGDATADIR);
+ snprintf (buffer, sizeof(buffer), "%s/M
admutt
rc", PKGDATADIR);
if (access (buffer, F_OK) != -1) {
if (source_rc (buffer, &err) != 0) {
fputs (err.data, stderr);
if (access (buffer, F_OK) != -1) {
if (source_rc (buffer, &err) != 0) {
fputs (err.data, stderr);