X-Git-Url: https://git.deb.at/w?p=pkg%2Fabook.git;a=blobdiff_plain;f=abook.h;h=0631b8f0f858ff6fbbce6420e454d7687069f04e;hp=b5e7c7627bbd291d101bef9080d473b5c37fb0ab;hb=7c501d6668c722e4b0200c4303c70fe840a708a9;hpb=7a7531e544d236d58ca077ce56b7d6d0c60faa09 diff --git a/abook.h b/abook.h index b5e7c76..0631b8f 100644 --- a/abook.h +++ b/abook.h @@ -13,12 +13,12 @@ int strcasecmp (const char *, const char *); int strncasecmp (const char *, const char *, size_t); #endif -#define MAIN_HELPLINE "q:quit ?:help a:add r:remove" +#define MAIN_HELPLINE N_("q:quit ?:help a:add r:remove") #define Y_STATUSLINE (LINES - 2) -#define MIN_LINES 20 -#define MIN_COLS 70 +#define MIN_LINES 20 +#define MIN_COLS 70 #define DEFAULT_UMASK 066 #define DIR_IN_HOME ".abook" @@ -38,7 +38,6 @@ int strncasecmp (const char *, const char *, size_t); #define safe_atoi(X) ((X == NULL) ? 0 : atoi(X)) #define safe_str(X) ((X == NULL) ? "" : X) -#define safe_strdup(X) ((X == NULL) ? NULL : strdup(X)) #ifndef min # define min(x,y) (((x)<(y)) ? (x):(y)) @@ -50,6 +49,9 @@ int strncasecmp (const char *, const char *, size_t); #define ISSPACE(c) isspace((unsigned char)c) +#define SKIPWS(c) while(*(c) && ISSPACE(*(c))) c++ +#define SKIPNONWS(c) while(*(c) && ! ISSPACE(*(c))) c++ + #ifndef DEBUG # define NDEBUG 1 #else