projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
muttlib.c
diff --git
a/muttlib.c
b/muttlib.c
index
f4b5e27
..
0b0530a
100644
(file)
--- a/
muttlib.c
+++ b/
muttlib.c
@@
-362,10
+362,9
@@
char *_mutt_expand_path (char *s, size_t slen, int rx)
case '+':
{
#ifdef USE_IMAP
case '+':
{
#ifdef USE_IMAP
- /* if folder = {host} or imap[s]://host/: don't append slash */
- if (imap_is_magic (NONULL (Maildir), NULL) == M_IMAP &&
- (Maildir[safe_strlen (Maildir) - 1] == '}' ||
- Maildir[safe_strlen (Maildir) - 1] == '/'))
+ /* if folder = imap[s]://host/: don't append slash */
+ if (imap_is_magic (NONULL (Maildir), NULL) == M_IMAP &&
+ Maildir[safe_strlen (Maildir) - 1] == '/')
strfcpy (p, NONULL (Maildir), sizeof (p));
else
#endif
strfcpy (p, NONULL (Maildir), sizeof (p));
else
#endif
@@
-457,13
+456,6
@@
char *_mutt_expand_path (char *s, size_t slen, int rx)
}
while (recurse);
}
while (recurse);
-#ifdef USE_IMAP
- /* Rewrite IMAP path in canonical form - aids in string comparisons of
- * folders. May possibly fail, in which case s should be the same. */
- if (imap_is_magic (s, NULL) == M_IMAP)
- imap_expand_path (s, slen);
-#endif
-
return (s);
}
return (s);
}
@@
-648,9
+640,9
@@
void mutt_free_envelope (ENVELOPE ** p)
void _mutt_mktemp (char *s, const char *src, int line)
{
void _mutt_mktemp (char *s, const char *src, int line)
{
- snprintf (s, _POSIX_PATH_MAX, "%s/muttng-%s-%d-%d-%d-%x", NONULL (Tempdir),
+ snprintf (s, _POSIX_PATH_MAX, "%s/muttng-%s-%d-%d-%d-%x
%x
", NONULL (Tempdir),
NONULL (Hostname), (int) getuid (), (int) getpid (), Counter++,
NONULL (Hostname), (int) getuid (), (int) getpid (), Counter++,
- (unsigned int) rand());
+ (unsigned int) rand()
, (unsigned int) rand()
);
debug_print (1, ("%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s));
unlink (s);
}
debug_print (1, ("%s:%d: mutt_mktemp returns \"%s\".\n", src, line, s));
unlink (s);
}