git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix ${readsocket } eol-replacement. Bug 2630
[exim.git]
/
src
/
src
/
readconf.c
diff --git
a/src/src/readconf.c
b/src/src/readconf.c
index a8f13350a8567a179abcb4778dd8f4cec1abac5d..dabe86348b1b0037e7ff6b112d963f15f1c9b72b 100644
(file)
--- a/
src/src/readconf.c
+++ b/
src/src/readconf.c
@@
-1546,7
+1546,7
@@
if (flags & opt_fn_print)
{
if (flags & opt_fn_print_label) printf("%s = ", name);
printf("%s\n", smtp_receive_timeout_s
{
if (flags & opt_fn_print_label) printf("%s = ", name);
printf("%s\n", smtp_receive_timeout_s
- ? string_printing2(smtp_receive_timeout_s,
FALSE
)
+ ? string_printing2(smtp_receive_timeout_s,
SP_TAB
)
: readconf_printtime(smtp_receive_timeout));
}
else if (*str == '$')
: readconf_printtime(smtp_receive_timeout));
}
else if (*str == '$')
@@
-2463,7
+2463,7
@@
switch(ol->type & opt_mask)
case opt_rewrite: /* Show the text value */
s = *(USS value);
if (!no_labels) printf("%s = ", name);
case opt_rewrite: /* Show the text value */
s = *(USS value);
if (!no_labels) printf("%s = ", name);
- printf("%s\n", s ? string_printing2(s,
FALSE
) : US"");
+ printf("%s\n", s ? string_printing2(s,
SP_TAB
) : US"");
break;
case opt_int:
break;
case opt_int:
@@
-3214,12
+3214,12
@@
if (config_file)
}
else
{
}
else
{
- if (
filename == NULL
)
+ if (
!filename
)
log_write(0, LOG_MAIN|LOG_PANIC_DIE, "non-existent configuration file(s): "
"%s", config_main_filelist);
else
log_write(0, LOG_MAIN|LOG_PANIC_DIE, "non-existent configuration file(s): "
"%s", config_main_filelist);
else
- log_write(0, LOG_MAIN|LOG_PANIC_DIE, "%s",
string_open_failed(errno,
- "configuration file %s", filename));
+ log_write(0, LOG_MAIN|LOG_PANIC_DIE, "%s",
+
string_open_failed(
"configuration file %s", filename));
}
/* Now, once we found and opened our configuration file, we change the directory
}
/* Now, once we found and opened our configuration file, we change the directory