/* Deal with the X Resource Manager.
- Copyright (C) 1990, 1993-1994, 2000-2013 Free Software Foundation,
+ Copyright (C) 1990, 1993-1994, 2000-2014 Free Software Foundation,
Inc.
Author: Joseph Arceneaux
#include "keyboard.h"
#endif
-char *x_get_string_resource (XrmDatabase rdb, const char *name,
- const char *class);
-
-\f
/* X file search path processing. */
char *lang = getenv ("LANG");
ptrdiff_t path_size = 100;
- char *path = xmalloc (path_size);
+ char *path = xmalloc_atomic (path_size);
ptrdiff_t path_len = 0;
const char *p = string;
else
next = p, next_len = 1;
- /* Do we have room for this component followed by a '\0' ? */
+ /* Do we have room for this component followed by a '\0'? */
if (path_size - path_len <= next_len)
{
if (min (PTRDIFF_MAX, SIZE_MAX) / 2 - 1 - path_len < next_len)
if (ptr == NULL)
return xstrdup ("/");
- copy = xmalloc (strlen (ptr) + 2);
+ copy = xmalloc_atomic (strlen (ptr) + 2);
strcpy (copy, ptr);
- strcat (copy, "/");
-
- return copy;
+ return strcat (copy, "/");
}
char *xdefault;
home = gethomedir ();
- xdefault = xmalloc (strlen (home) + sizeof ".Xdefaults");
+ xdefault = xmalloc_atomic (strlen (home) + sizeof (".Xdefaults"));
strcpy (xdefault, home);
strcat (xdefault, ".Xdefaults");
db = XrmGetFileDatabase (xdefault);
if (x_get_resource (rdb, name, class, x_rm_string, &value))
return (char *) value.addr;
- return (char *) 0;
+ return 0;
}
\f
/* Stand-alone test facilities. */
displayname = "localhost:0.0";
lp = member ("-xrm", arg_list);
- if (! NIL (lp))
- resource_string = car (cdr (lp));
- else
- resource_string = (char *) 0;
+ resource_string = NIL (lp) ? 0 : car (cdr (lp));
lp = member ("-c", arg_list);
if (! NIL (lp))