X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib.h;h=b12b8cc4f20f02c92a9ce495d6dd4c592b75ed62;hp=a6eb67b4e40354187eb31552df1ff68957323f2c;hb=4dc555afd969ac7aed5c50db80ff9df17ed39e47;hpb=203e950e3d3c76795fa49895d040f732adad2049 diff --git a/lib.h b/lib.h index a6eb67b..b12b8cc 100644 --- a/lib.h +++ b/lib.h @@ -32,25 +32,6 @@ # define TRUE 1 # define FALSE 0 -# define HUGE_STRING 5120 -# define LONG_STRING 1024 -# define STRING 256 -# define SHORT_STRING 128 - -/* - * Create a format string to be used with scanf. - * To use it, write, for instance, MUTT_FORMAT(HUGE_STRING). - * - * See K&R 2nd ed, p. 231 for an explanation. - */ -# define _MUTT_FORMAT_2(a,b) "%" a b -# define _MUTT_FORMAT_1(a, b) _MUTT_FORMAT_2(#a, b) -# define MUTT_FORMAT(a) _MUTT_FORMAT_1(a, "s") -# define MUTT_FORMAT2(a,b) _MUTT_FORMAT_1(a, b) - -# define ISSPACE(c) isspace((unsigned char)c) -# define strfcpy(A,B,C) strncpy(A,B,C), *(A+(C)-1)=0 - # undef MAX # undef MIN # define MAX(a,b) ((a) < (b) ? (b) : (a)) @@ -58,18 +39,6 @@ #define FOREVER while (1) -/* this macro must check for *c == 0 since isspace(0) has unreliable behavior - on some systems */ -# define SKIPWS(c) while (*(c) && isspace ((unsigned char) *(c))) c++; - -#define ISBLANK(c) (c == ' ' || c == '\t') -/* - * These functions aren't defined in lib.c, but - * they are used there. - * - * A non-mutt "implementation" (ahem) can be found in extlib.c. - */ - # ifndef _EXTLIB_C extern void (*mutt_error) (const char *, ...); # endif @@ -82,37 +51,23 @@ FILE *safe_fopen (const char *, const char *); char *mutt_concat_path (char *, const char *, const char *, size_t); char *mutt_read_line (char *, size_t *, FILE *, int *); char *mutt_skip_whitespace (char *); -char *mutt_strlower (char *); -char *mutt_substrcpy (char *, const char *, const char *, size_t); -char *mutt_substrdup (const char *, const char *); -char *safe_strcat (char *, size_t, const char *); -char *safe_strncat (char *, size_t, const char *, size_t); -char *safe_strdup (const char *); - -const char *mutt_stristr (const char *, const char *); + const char *mutt_basename (const char *); int mutt_copy_stream (FILE *, FILE *); int mutt_copy_bytes (FILE *, FILE *, size_t); int mutt_rx_sanitize_string (char *, size_t, const char *); -int mutt_strcasecmp (const char *, const char *); -int mutt_strcmp (const char *, const char *); -int mutt_strncasecmp (const char *, const char *, size_t); -int mutt_strncmp (const char *, const char *, size_t); -int mutt_strcoll (const char *, const char *); + int safe_open (const char *, int); int safe_symlink (const char *, const char *); int safe_rename (const char *, const char *); int safe_fclose (FILE **); size_t mutt_quote_filename (char *, size_t, const char *); -size_t mutt_strlen (const char *); void mutt_nocurses_error (const char *, ...); void mutt_remove_trailing_ws (char *); void mutt_sanitize_filename (char *, short); -void mutt_str_replace (char **p, const char *s); -void mutt_str_adjust (char **p); void mutt_unlink (const char *); #endif