#include <errno.h>
#include <sys/wait.h>
-#define CHECK_PAGER \
- if ((CurrentMenu == MENU_PAGER) && \
- (!option || (option->flags & R_RESORT))) \
- { \
- snprintf (err->data, err->dsize, \
- _("Not available in this menu.")); \
- return (-1); \
- } else
-
/*
* prototypes
*/
static void sys_to_string (char* dst, size_t dstlen,
struct option_t* option) {
- char* val = NULL, *t = NULL;
+ char *val = NULL, *t = NULL;
int clean = 0;
/* get some $muttng_ values dynamically */
static void quad_to_string (char* dst, size_t dstlen,
struct option_t* option) {
- char *vals[] = { "no", "yes", "ask-no", "ask-yes" };
+ const char *vals[] = { "no", "yes", "ask-no", "ask-yes" };
snprintf (dst, dstlen, "%s=%s", option->option,
vals[quadoption (option->data)]);
}
return 0;
}
-static int print_attach_list (LIST *lp, char op, char *name) {
+static int print_attach_list (LIST *lp, char op, const char *name) {
while (lp) {
printf("attachments %c%s %s/%s\n", op, name,
((ATTACH_MATCH *)lp->data)->major,
}
static struct option_t* add_option (const char* name, const char* init,
- short type, short dup) {
+ short type, short dodup) {
struct option_t* option = mem_calloc (1, sizeof (struct option_t));
debug_print (1, ("adding $%s\n", name));
option->option = str_dup (name);
option->type = type;
if (init)
- option->init = dup ? str_dup (init) : (char*) init;
+ option->init = dodup ? str_dup (init) : (char*) init;
return (option);
}
return (map);
}
+#define CHECK_PAGER \
+ if ((CurrentMenu == MENU_PAGER) && \
+ (!option || (option->flags & R_RESORT))) \
+ { \
+ snprintf (err->data, err->dsize, \
+ _("Not available in this menu.")); \
+ return (-1); \
+ }
+
static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
BUFFER * err)
{
try == user entered data for completion.
len == length of dest buffer.
*/
-static void candidate (char *dest, char *try, char *src, int len)
+static void candidate (char *dest, char *try, const char *src, int len)
{
int l;
|| !str_ncmp (buffer, "unset", 5)
|| !str_ncmp (buffer, "reset", 5)
|| !str_ncmp (buffer, "toggle", 6)) { /* complete variables */
- char *prefixes[] = { "no", "inv", "?", "&", 0 };
+ const char *prefixes[] = { "no", "inv", "?", "&", NULL };
pt++;
/* loop through all the possible prefixes (no, inv, ...) */
char tmp[LONG_STRING], tmp2[LONG_STRING];
char *s, *d;
size_t dlen = buffer + len - pt - spaces;
- char *vals[] = { "no", "yes", "ask-no", "ask-yes" };
+ const char *vals[] = { "no", "yes", "ask-no", "ask-yes" };
tmp[0] = '\0';
"", p);
}
else if (DTYPE (option->type) == DT_MAGIC) {
- char *p;
+ const char *p;
switch (DefaultMagic) {
case M_MBOX:
p = "mbox";
return 0;
}
-char *mutt_getnamebyvalue (int val, const struct mapping_t *map)
+const char *mutt_getnamebyvalue (int val, const struct mapping_t *map)
{
int i;
{
struct passwd *pw;
struct utsname utsname;
- char *p, buffer[STRING], error[STRING];
+ const char *p;
+ char buffer[STRING], error[STRING];
int i, default_rc = 0, need_pause = 0;
BUFFER err;
#ifdef USE_NNTP
{
FILE *f;
- char *i;
+ char *q;
if ((f = safe_fopen (SYSCONFDIR "/nntpserver", "r"))) {
buffer[0] = '\0';
fgets (buffer, sizeof (buffer), f);
- p = (char*) &buffer;
+ p = (char*)&buffer;
SKIPWS (p);
- i = p;
- while (*i && (*i != ' ') && (*i != '\t') && (*i != '\r')
- && (*i != '\n'))
- i++;
- *i = '\0';
+ q = p;
+ while (*q && !isspace(*q))
+ q++;
+ *q = '\0';
NewsServer = str_dup (p);
fclose (f);
}