/* Deal with the X Resource Manager.
- Copyright (C) 1990, 1993-1994, 2000-2011 Free Software Foundation, Inc.
+ Copyright (C) 1990, 1993-1994, 2000-2012 Free Software Foundation, Inc.
Author: Joseph Arceneaux
Created: 4/90
/* The string which gets substituted for the %C escape in XFILESEARCHPATH
and friends, or zero if none was specified. */
-char *x_customization_string;
+static char *x_customization_string;
/* Return the value of the emacs.customization (Emacs.Customization)
refers to %L only when the LANG environment variable is set, or
otherwise provided by X.
- ESCAPED_SUFFIX and SUFFIX are postpended to STRING if they are
- non-zero. %-escapes in ESCAPED_SUFFIX are expanded; STRING is left
- alone.
+ ESCAPED_SUFFIX is postpended to STRING if it is non-zero.
+ %-escapes in ESCAPED_SUFFIX are expanded.
Return NULL otherwise. */
static char *
-magic_file_p (const char *string, EMACS_INT string_len, const char *class, const char *escaped_suffix, const char *suffix)
+magic_file_p (const char *string, EMACS_INT string_len, const char *class,
+ const char *escaped_suffix)
{
char *lang = getenv ("LANG");
- int path_size = 100;
+ ptrdiff_t path_size = 100;
char *path = (char *) xmalloc (path_size);
- int path_len = 0;
+ ptrdiff_t path_len = 0;
const char *p = string;
{
/* The chunk we're about to stick on the end of result. */
const char *next = NULL;
- int next_len;
+ ptrdiff_t next_len;
if (*p == '%')
{
next = p, next_len = 1;
/* Do we have room for this component followed by a '\0' ? */
- if (path_len + next_len + 1 > path_size)
+ if (path_size - path_len <= next_len)
{
+ if (min (PTRDIFF_MAX, SIZE_MAX) / 2 - 1 - path_len < next_len)
+ memory_full (SIZE_MAX);
path_size = (path_len + next_len + 1) * 2;
path = (char *) xrealloc (path, path_size);
}
}
}
- /* Perhaps we should add the SUFFIX now. */
- if (suffix)
- {
- int suffix_len = strlen (suffix);
-
- if (path_len + suffix_len + 1 > path_size)
- {
- path_size = (path_len + suffix_len + 1);
- path = (char *) xrealloc (path, path_size);
- }
-
- memcpy (path + path_len, suffix, suffix_len);
- path_len += suffix_len;
- }
-
path[path_len] = '\0';
if (! file_p (path))
the path name of the one we found otherwise. */
static char *
-search_magic_path (const char *search_path, const char *class, const char *escaped_suffix, const char *suffix)
+search_magic_path (const char *search_path, const char *class,
+ const char *escaped_suffix)
{
const char *s, *p;
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);
if (path)
return path;
}
char *path;
s = "%N%S";
- path = magic_file_p (s, strlen (s), class, escaped_suffix, suffix);
+ path = magic_file_p (s, strlen (s), class, escaped_suffix);
if (path)
return path;
}
path = getenv ("XFILESEARCHPATH");
if (! path) path = PATH_X_DEFAULTS;
- p = search_magic_path (path, class, 0, 0);
+ p = search_magic_path (path, class, 0);
if (p)
{
db = XrmGetFileDatabase (p);
/* Check for XUSERFILESEARCHPATH. It is a path of complete file
names, not directories. */
if (((path = getenv ("XUSERFILESEARCHPATH"))
- && (file = search_magic_path (path, class, 0, 0)))
+ && (file = search_magic_path (path, class, 0)))
/* Check for APPLRESDIR; it is a path of directories. In each,
we have to search for LANG/CLASS and then CLASS. */
|| ((path = getenv ("XAPPLRESDIR"))
- && ((file = search_magic_path (path, class, "/%L/%N", 0))
- || (file = search_magic_path (path, class, "/%N", 0))))
+ && ((file = search_magic_path (path, class, "/%L/%N"))
+ || (file = search_magic_path (path, class, "/%N"))))
/* Check in the home directory. This is a bit of a hack; let's
hope one's home directory doesn't contain any %-escapes. */
|| (free_it = gethomedir (),
- ((file = search_magic_path (free_it, class, "%L/%N", 0))
- || (file = search_magic_path (free_it, class, "%N", 0)))))
+ ((file = search_magic_path (free_it, class, "%L/%N"))
+ || (file = search_magic_path (free_it, class, "%N")))))
{
XrmDatabase db = XrmGetFileDatabase (file);
xfree (file);
{
XrmDatabase db;
char *p;
- char *path = 0, *home = 0;
- const char *host;
+ char *path = 0;
if ((p = getenv ("XENVIRONMENT")) == NULL)
{
- home = gethomedir ();
- host = get_system_name ();
- path = (char *) xmalloc (strlen (home)
- + sizeof (".Xdefaults-")
- + strlen (host));
- sprintf (path, "%s%s%s", home, ".Xdefaults-", host);
+ static char const xdefaults[] = ".Xdefaults-";
+ char *home = gethomedir ();
+ char const *host = get_system_name ();
+ ptrdiff_t pathsize = strlen (home) + sizeof xdefaults + strlen (host);
+ path = (char *) xrealloc (home, pathsize);
+ strcat (strcat (path, xdefaults), host);
p = path;
}
db = XrmGetFileDatabase (p);
xfree (path);
- xfree (home);
return db;
}
/* Types of values that we can find in a database */
#define XrmStringType "String" /* String representation */
-XrmRepresentation x_rm_string; /* Quark representation */
+static XrmRepresentation x_rm_string; /* Quark representation */
/* Load X resources based on the display and a possible -xrm option. */
XrmDatabase db;
char line[256];
+#if defined USE_MOTIF || !defined HAVE_XFT || !defined USE_LUCID
const char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1";
+#endif
#ifdef USE_MOTIF
const char *courier = "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1";
dialog from `double-click-time'. */
if (INTEGERP (Vdouble_click_time) && XINT (Vdouble_click_time) > 0)
{
- sprintf (line, "%s*fsb*DirList.doubleClickInterval: %d",
+ sprintf (line, "%s*fsb*DirList.doubleClickInterval: %"pI"d",
myclass, XFASTINT (Vdouble_click_time));
XrmPutLineResource (&rdb, line);
- sprintf (line, "%s*fsb*ItemsList.doubleClickInterval: %d",
+ sprintf (line, "%s*fsb*ItemsList.doubleClickInterval: %"pI"d",
myclass, XFASTINT (Vdouble_click_time));
XrmPutLineResource (&rdb, line);
}
XrmClass classlist[100];
XrmRepresentation type;
- XrmStringToNameList(name, namelist);
- XrmStringToClassList(class, classlist);
+ XrmStringToNameList (name, namelist);
+ XrmStringToClassList (class, classlist);
if (XrmQGetResource (rdb, namelist, classlist, &type, &value) == True
&& (type == expected_type))
#define free_arglist(list)
static List
-member (elt, list)
- char *elt;
- List list;
+member (char *elt, List list)
{
List p;
}
static void
-fatal (msg, prog, x1, x2, x3, x4, x5)
- char *msg, *prog;
- int x1, x2, x3, x4, x5;
+fatal (char *msg, char *prog)
{
- if (errno)
- perror (prog);
+ if (errno)
+ perror (prog);
- (void) fprintf (stderr, msg, prog, x1, x2, x3, x4, x5);
- exit (1);
+ (void) fprintf (stderr, msg, prog);
+ exit (1);
}
-main (argc, argv)
- int argc;
- char **argv;
+int
+main (int argc, char **argv)
{
Display *display;
char *displayname, *resource_string, *class, *name;
printf ("\tExit.\n\n");
XCloseDisplay (display);
+
+ return 0;
}
#endif /* TESTRM */
HCoop / bpt / emacs.git / blobdiff