diff options
Diffstat (limited to 'src/xrdb.c')
| -rw-r--r-- | src/xrdb.c | 176 |
1 files changed, 61 insertions, 115 deletions
diff --git a/src/xrdb.c b/src/xrdb.c index c8cb55cb7b8..90a85e287bb 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -20,37 +20,20 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef emacs #include <config.h> -#endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif +#include <errno.h> #include <epaths.h> #include <stdio.h> #include <setjmp.h> -#if 1 /* I'd really appreciate it if this code could go away... -JimB */ -/* This avoids lossage in the `dual-universe' headers on AT&T SysV - X11. Don't do it on Solaris, because it breaks compilation with - XFree86 4.0.3 (and probably many other X11R6 releases) on Solaris - 2 */ -#if defined(USG5) && !defined(SOLARIS2) -#ifndef SYSV -#define SYSV -#endif -#endif /* USG5 && !SOLARIS2 */ - -#endif /* 1 */ - #include <X11/Xlib.h> #include <X11/Xatom.h> -#if 0 -#include <X11/Xos.h> -#endif #include <X11/X.h> #include <X11/Xutil.h> #include <X11/Xresource.h> @@ -65,40 +48,21 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include "lisp.h" -extern char *getenv (); - -/* This does cause trouble on AIX. I'm going to take the comment at - face value. */ -#if 0 -extern short getuid (); /* If this causes portability problems, - I think we should just delete it; it'll - default to `int' anyway. */ +#ifdef USE_MOTIF +/* For Vdouble_click_time. */ +#include "keyboard.h" #endif -#ifdef DECLARE_GETPWUID_WITH_UID_T +extern char *getenv (const char *); + extern struct passwd *getpwuid (uid_t); extern struct passwd *getpwnam (const char *); -#else -extern struct passwd *getpwuid (); -extern struct passwd *getpwnam (); -#endif -extern char *get_system_name (); - -/* Make sure not to #include anything after these definitions. Let's - not step on anyone's prototypes. */ -#ifdef emacs -/* darwin.h may have already defined these. */ -#undef malloc -#undef realloc -#undef free -#define malloc xmalloc -#define realloc xrealloc -#define free xfree -#endif +extern const char *get_system_name (void); -char *x_get_string_resource (); -static int file_p (); +char *x_get_string_resource (XrmDatabase rdb, const char *name, + const char *class); +static int file_p (const char *filename); /* X file search path processing. */ @@ -113,9 +77,7 @@ char *x_customization_string; resource, for later use in search path decoding. If we find no such resource, return zero. */ char * -x_get_customization_string (db, name, class) - XrmDatabase db; - char *name, *class; +x_get_customization_string (XrmDatabase db, const char *name, const char *class) { char *full_name = (char *) alloca (strlen (name) + sizeof ("customization") + 3); @@ -130,7 +92,7 @@ x_get_customization_string (db, name, class) if (result) { - char *copy = (char *) malloc (strlen (result) + 1); + char *copy = (char *) xmalloc (strlen (result) + 1); strcpy (copy, result); return copy; } @@ -170,23 +132,20 @@ x_get_customization_string (db, name, class) Return NULL otherwise. */ static char * -magic_file_p (string, string_len, class, escaped_suffix, suffix) - char *string; - int string_len; - char *class, *escaped_suffix, *suffix; +magic_file_p (const char *string, EMACS_INT string_len, const char *class, const char *escaped_suffix, const char *suffix) { char *lang = getenv ("LANG"); int path_size = 100; - char *path = (char *) malloc (path_size); + char *path = (char *) xmalloc (path_size); int path_len = 0; - char *p = string; + const char *p = string; while (p < string + string_len) { /* The chunk we're about to stick on the end of result. */ - char *next = NULL; + const char *next = NULL; int next_len; if (*p == '%') @@ -229,7 +188,7 @@ magic_file_p (string, string_len, class, escaped_suffix, suffix) case 'l': if (! lang) { - free (path); + xfree (path); return NULL; } @@ -239,7 +198,7 @@ magic_file_p (string, string_len, class, escaped_suffix, suffix) case 't': case 'c': - free (path); + xfree (path); return NULL; } } @@ -250,10 +209,10 @@ magic_file_p (string, string_len, class, escaped_suffix, suffix) if (path_len + next_len + 1 > path_size) { path_size = (path_len + next_len + 1) * 2; - path = (char *) realloc (path, path_size); + path = (char *) xrealloc (path, path_size); } - bcopy (next, path + path_len, next_len); + memcpy (path + path_len, next, next_len); path_len += next_len; p++; @@ -276,10 +235,10 @@ magic_file_p (string, string_len, class, escaped_suffix, suffix) if (path_len + suffix_len + 1 > path_size) { path_size = (path_len + suffix_len + 1); - path = (char *) realloc (path, path_size); + path = (char *) xrealloc (path, path_size); } - bcopy (suffix, path + path_len, suffix_len); + memcpy (path + path_len, suffix, suffix_len); path_len += suffix_len; } @@ -287,7 +246,7 @@ magic_file_p (string, string_len, class, escaped_suffix, suffix) if (! file_p (path)) { - free (path); + xfree (path); return NULL; } @@ -296,7 +255,7 @@ magic_file_p (string, string_len, class, escaped_suffix, suffix) static char * -gethomedir () +gethomedir (void) { struct passwd *pw; char *ptr; @@ -317,7 +276,7 @@ gethomedir () if (ptr == NULL) return xstrdup ("/"); - copy = (char *) malloc (strlen (ptr) + 2); + copy = (char *) xmalloc (strlen (ptr) + 2); strcpy (copy, ptr); strcat (copy, "/"); @@ -326,8 +285,7 @@ gethomedir () static int -file_p (filename) - char *filename; +file_p (const char *filename) { struct stat status; @@ -342,10 +300,9 @@ file_p (filename) the path name of the one we found otherwise. */ static char * -search_magic_path (search_path, class, escaped_suffix, suffix) - char *search_path, *class, *escaped_suffix, *suffix; +search_magic_path (const char *search_path, const char *class, const char *escaped_suffix, const char *suffix) { - register char *s, *p; + const char *s, *p; for (s = search_path; *s; s = p) { @@ -354,7 +311,8 @@ search_magic_path (search_path, class, escaped_suffix, suffix) if (p > s) { - char *path = magic_file_p (s, p - s, class, escaped_suffix, suffix); + char *path = magic_file_p (s, p - s, class, escaped_suffix, + suffix); if (path) return path; } @@ -378,20 +336,20 @@ search_magic_path (search_path, class, escaped_suffix, suffix) /* Producing databases for individual sources. */ static XrmDatabase -get_system_app (class) - char *class; +get_system_app (const char *class) { XrmDatabase db = NULL; - char *path; + const char *path; + char *p; path = getenv ("XFILESEARCHPATH"); if (! path) path = PATH_X_DEFAULTS; - path = search_magic_path (path, class, 0, 0); - if (path) + p = search_magic_path (path, class, 0, 0); + if (p) { - db = XrmGetFileDatabase (path); - free (path); + db = XrmGetFileDatabase (p); + xfree (p); } return db; @@ -399,18 +357,16 @@ get_system_app (class) static XrmDatabase -get_fallback (display) - Display *display; +get_fallback (Display *display) { return NULL; } static XrmDatabase -get_user_app (class) - char *class; +get_user_app (const char *class) { - char *path; + const char *path; char *file = 0; char *free_it = 0; @@ -432,19 +388,18 @@ get_user_app (class) || (file = search_magic_path (free_it, class, "%N", 0))))) { XrmDatabase db = XrmGetFileDatabase (file); - free (file); - free (free_it); + xfree (file); + xfree (free_it); return db; } - free (free_it); + xfree (free_it); return NULL; } static XrmDatabase -get_user_db (display) - Display *display; +get_user_db (Display *display) { XrmDatabase db; char *xdefs; @@ -463,12 +418,12 @@ get_user_db (display) char *xdefault; home = gethomedir (); - xdefault = (char *) malloc (strlen (home) + sizeof (".Xdefaults")); + xdefault = (char *) xmalloc (strlen (home) + sizeof (".Xdefaults")); strcpy (xdefault, home); strcat (xdefault, ".Xdefaults"); db = XrmGetFileDatabase (xdefault); - free (home); - free (xdefault); + xfree (home); + xfree (xdefault); } #ifdef HAVE_XSCREENRESOURCESTRING @@ -485,17 +440,18 @@ get_user_db (display) } static XrmDatabase -get_environ_db () +get_environ_db (void) { XrmDatabase db; char *p; - char *path = 0, *home = 0, *host; + char *path = 0, *home = 0; + const char *host; if ((p = getenv ("XENVIRONMENT")) == NULL) { home = gethomedir (); host = get_system_name (); - path = (char *) malloc (strlen (home) + path = (char *) xmalloc (strlen (home) + sizeof (".Xdefaults-") + strlen (host)); sprintf (path, "%s%s%s", home, ".Xdefaults-", host); @@ -504,8 +460,8 @@ get_environ_db () db = XrmGetFileDatabase (p); - free (path); - free (home); + xfree (path); + xfree (home); return db; } @@ -520,20 +476,18 @@ XrmRepresentation x_rm_string; /* Quark representation */ /* Load X resources based on the display and a possible -xrm option. */ XrmDatabase -x_load_resources (display, xrm_string, myname, myclass) - Display *display; - char *xrm_string, *myname, *myclass; +x_load_resources (Display *display, const char *xrm_string, + const char *myname, const char *myclass) { XrmDatabase user_database; XrmDatabase rdb; XrmDatabase db; char line[256]; - char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1"; + const char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1"; #ifdef USE_MOTIF - char *courier = "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1"; - extern Lisp_Object Vdouble_click_time; + const char *courier = "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1"; #endif x_rm_string = XrmStringToQuark (XrmStringType); @@ -612,7 +566,7 @@ x_load_resources (display, xrm_string, myname, myclass) /* Figure out what the "customization string" is, so we can use it to decode paths. */ - free (x_customization_string); + xfree (x_customization_string); x_customization_string = x_get_customization_string (user_database, myname, myclass); @@ -656,11 +610,7 @@ x_load_resources (display, xrm_string, myname, myclass) and of type TYPE from database RDB. The value is returned in RET_VALUE. */ int -x_get_resource (rdb, name, class, expected_type, ret_value) - XrmDatabase rdb; - char *name, *class; - XrmRepresentation expected_type; - XrmValue *ret_value; +x_get_resource (XrmDatabase rdb, const char *name, const char *class, XrmRepresentation expected_type, XrmValue *ret_value) { XrmValue value; XrmName namelist[100]; @@ -676,7 +626,7 @@ x_get_resource (rdb, name, class, expected_type, ret_value) if (type == x_rm_string) ret_value->addr = (char *) value.addr; else - bcopy (value.addr, ret_value->addr, ret_value->size); + memcpy (ret_value->addr, value.addr, ret_value->size); return value.size; } @@ -688,9 +638,7 @@ x_get_resource (rdb, name, class, expected_type, ret_value) database RDB. */ char * -x_get_string_resource (rdb, name, class) - XrmDatabase rdb; - char *name, *class; +x_get_string_resource (XrmDatabase rdb, const char *name, const char *class) { XrmValue value; @@ -734,8 +682,6 @@ fatal (msg, prog, x1, x2, x3, x4, x5) char *msg, *prog; int x1, x2, x3, x4, x5; { - extern int errno; - if (errno) perror (prog); |