mirror of
https://github.com/sheumann/hush.git
synced 2024-08-21 11:28:57 +00:00
randomconfig fixes
This commit is contained in:
parent
1fe7887659
commit
31d58e58d2
@ -270,7 +270,8 @@ struct globals {
|
|||||||
#define INIT_G() do { \
|
#define INIT_G() do { \
|
||||||
SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
|
SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
|
||||||
last_file_modified = -1; \
|
last_file_modified = -1; \
|
||||||
last_search_pattern = xzalloc(2); /* "" but has space for 2 chars */ \
|
/* "" but has space for 2 chars: */ \
|
||||||
|
USE_FEATURE_VI_SEARCH(last_search_pattern = xzalloc(2);) \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
|
|
||||||
|
@ -272,7 +272,9 @@ static void re_wrap(void)
|
|||||||
last_line_pos = new_line_pos;
|
last_line_pos = new_line_pos;
|
||||||
cur_fline = new_cur_fline;
|
cur_fline = new_cur_fline;
|
||||||
/* max_lineno is screen-size independent */
|
/* max_lineno is screen-size independent */
|
||||||
|
#if ENABLE_FEATURE_LESS_REGEXP
|
||||||
pattern_valid = 0;
|
pattern_valid = 0;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -261,11 +261,15 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
|
|||||||
OPT_N = 1 << 4, // request notification
|
OPT_N = 1 << 4, // request notification
|
||||||
OPT_f = 1 << 5, // sender address
|
OPT_f = 1 << 5, // sender address
|
||||||
OPT_F = 1 << 6, // sender name, overrides $NAME
|
OPT_F = 1 << 6, // sender name, overrides $NAME
|
||||||
|
#if ENABLE_FEATURE_SENDMAIL_MAILX
|
||||||
OPT_s = 1 << 7, // subject
|
OPT_s = 1 << 7, // subject
|
||||||
OPT_j = 1 << 8, // assumed charset
|
OPT_j = 1 << 8, // assumed charset
|
||||||
OPT_a = 1 << 9, // attachment(s)
|
OPT_a = 1 << 9, // attachment(s)
|
||||||
|
#if ENABLE_FEATURE_SENDMAIL_MAILXX
|
||||||
OPT_c = 1 << 10, // carbon copy
|
OPT_c = 1 << 10, // carbon copy
|
||||||
OPT_e = 1 << 11, // errors-to address
|
OPT_e = 1 << 11, // errors-to address
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
// init global variables
|
// init global variables
|
||||||
@ -405,10 +409,12 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
|
|||||||
} else if (0 == strncmp("Subject: ", s, 9)) {
|
} else if (0 == strncmp("Subject: ", s, 9)) {
|
||||||
// we read subject -> use it verbatim unless it is specified
|
// we read subject -> use it verbatim unless it is specified
|
||||||
// on command line
|
// on command line
|
||||||
if (!(opts & OPT_s))
|
#if ENABLE_FEATURE_SENDMAIL_MAILX
|
||||||
llist_add_to_end(&headers, s);
|
if (opts & OPT_s)
|
||||||
else
|
|
||||||
free(s);
|
free(s);
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
llist_add_to_end(&headers, s);
|
||||||
} else if (s[0]) {
|
} else if (s[0]) {
|
||||||
// misc header
|
// misc header
|
||||||
llist_add_to_end(&headers, s);
|
llist_add_to_end(&headers, s);
|
||||||
@ -430,6 +436,7 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// put (possibly encoded) subject
|
// put (possibly encoded) subject
|
||||||
|
#if ENABLE_FEATURE_SENDMAIL_MAILX
|
||||||
if (opts & OPT_j)
|
if (opts & OPT_j)
|
||||||
sane((char *)opt_charset);
|
sane((char *)opt_charset);
|
||||||
if (opts & OPT_s) {
|
if (opts & OPT_s) {
|
||||||
@ -443,6 +450,7 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
|
|||||||
}
|
}
|
||||||
printf("\r\n");
|
printf("\r\n");
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
// put sender name, $NAME is the default
|
// put sender name, $NAME is the default
|
||||||
if (!(opts & OPT_F))
|
if (!(opts & OPT_F))
|
||||||
|
Loading…
Reference in New Issue
Block a user