comparison src/xrdb.c @ 109687:d6c4fa12ba52

Cleanup xrdb.c. * src/xrdb.c: Remove include guard. Remove DECLARE_GETPWUID_WITH_UID_T conditional it had no effect. Remove #if 0 code. Replace malloc->xmalloc, free->xfree, realloc->xrealloc instead of using #defines.

109686:111f90199914

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 "lisp.h"

extern char *getenv (const char *);

/* 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.  */
#endif

#ifdef DECLARE_GETPWUID_WITH_UID_T
extern struct passwd *getpwuid (uid_t);
extern struct passwd *getpwnam (const char *);
#else
extern struct passwd *getpwuid (uid_t);
extern struct passwd *getpwnam (const char *);
#endif

extern char *get_system_name (void);

/* 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

char *x_get_string_resource (XrmDatabase rdb, const char *name,
			     const char *class);
static int file_p (const char *filename);

  result = x_get_string_resource (db, full_name, full_class);

  if (result)
    {
      char *copy = (char *) malloc (strlen (result) + 1);
      strcpy (copy, result);
      return copy;
    }
  else
    return 0;

magic_file_p (const char *string, 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);
  int path_len = 0;

  const char *p = string;

  while (p < string + string_len)

	      case 'L':
	      case 'l':
		if (! lang)
		  {
		    free (path);
		    return NULL;
		  }

		next = lang;
		next_len = strlen (next);
		break;

	      case 't':
	      case 'c':
		free (path);
		return NULL;
	      }
	}
      else
	next = p, next_len = 1;

      /* Do we have room for this component followed by a '\0' ?  */
      if (path_len + next_len + 1 > path_size)
	{
	  path_size = (path_len + next_len + 1) * 2;
	  path = (char *) realloc (path, path_size);
	}

      memcpy (path + path_len, next, next_len);
      path_len += next_len;

      int suffix_len = strlen (suffix);

      if (path_len + suffix_len + 1 > path_size)
	{
	  path_size = (path_len + suffix_len + 1);
	  path = (char *) realloc (path, path_size);
	}

      memcpy (path + path_len, suffix, suffix_len);
      path_len += suffix_len;
    }

  path[path_len] = '\0';

  if (! file_p (path))
    {
      free (path);
      return NULL;
    }

  return path;
}

    }

  if (ptr == NULL)
    return xstrdup ("/");

  copy = (char *) malloc (strlen (ptr) + 2);
  strcpy (copy, ptr);
  strcat (copy, "/");

  return copy;
}

  path = search_magic_path (path, class, 0, 0);
  if (path)
    {
      db = XrmGetFileDatabase (path);
      free (path);
    }

  return db;
}

      || (free_it = gethomedir (),
	  ((file = search_magic_path (free_it, class, "%L/%N", 0))
	   || (file = search_magic_path (free_it, class, "%N", 0)))))
    {
      XrmDatabase db = XrmGetFileDatabase (file);
      free (file);
      free (free_it);
      return db;
    }

  free (free_it);
  return NULL;
}


static XrmDatabase

    {
      char *home;
      char *xdefault;

      home = gethomedir ();
      xdefault = (char *) malloc (strlen (home) + sizeof (".Xdefaults"));
      strcpy (xdefault, home);
      strcat (xdefault, ".Xdefaults");
      db = XrmGetFileDatabase (xdefault);
      free (home);
      free (xdefault);
    }

#ifdef HAVE_XSCREENRESOURCESTRING
  /* Get the screen-specific resources too.  */
  xdefs = XScreenResourceString (DefaultScreenOfDisplay (display));

  if ((p = getenv ("XENVIRONMENT")) == NULL)
    {
      home = gethomedir ();
      host = get_system_name ();
      path = (char *) malloc (strlen (home)
			      + sizeof (".Xdefaults-")
			      + strlen (host));
      sprintf (path, "%s%s%s", home, ".Xdefaults-", host);
      p = path;
    }

  db = XrmGetFileDatabase (p);

  free (path);
  free (home);

  return db;
}

/* External interface.  */

  user_database = get_user_db (display);

  /* Figure out what the "customization string" is, so we can use it
     to decode paths.  */
  free (x_customization_string);
  x_customization_string
    = x_get_customization_string (user_database, myname, myclass);

  /* Get application system defaults */
  db = get_system_app (myclass);

109687:d6c4fa12ba52

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/>.  */

#include <config.h>

#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

#include "lisp.h"

extern char *getenv (const char *);

extern struct passwd *getpwuid (uid_t);
extern struct passwd *getpwnam (const char *);

extern char *get_system_name (void);

char *x_get_string_resource (XrmDatabase rdb, const char *name,
			     const char *class);
static int file_p (const char *filename);

  result = x_get_string_resource (db, full_name, full_class);

  if (result)
    {
      char *copy = (char *) xmalloc (strlen (result) + 1);
      strcpy (copy, result);
      return copy;
    }
  else
    return 0;

magic_file_p (const char *string, int string_len, const char *class, const char *escaped_suffix, const char *suffix)
{
  char *lang = getenv ("LANG");

  int path_size = 100;
  char *path = (char *) xmalloc (path_size);
  int path_len = 0;

  const char *p = string;

  while (p < string + string_len)

	      case 'L':
	      case 'l':
		if (! lang)
		  {
		    xfree (path);
		    return NULL;
		  }

		next = lang;
		next_len = strlen (next);
		break;

	      case 't':
	      case 'c':
		xfree (path);
		return NULL;
	      }
	}
      else
	next = p, next_len = 1;

      /* Do we have room for this component followed by a '\0' ?  */
      if (path_len + next_len + 1 > path_size)
	{
	  path_size = (path_len + next_len + 1) * 2;
	  path = (char *) xrealloc (path, path_size);
	}

      memcpy (path + path_len, next, next_len);
      path_len += next_len;

      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))
    {
      xfree (path);
      return NULL;
    }

  return path;
}

    }

  if (ptr == NULL)
    return xstrdup ("/");

  copy = (char *) xmalloc (strlen (ptr) + 2);
  strcpy (copy, ptr);
  strcat (copy, "/");

  return copy;
}

  path = search_magic_path (path, class, 0, 0);
  if (path)
    {
      db = XrmGetFileDatabase (path);
      xfree (path);
    }

  return db;
}

      || (free_it = gethomedir (),
	  ((file = search_magic_path (free_it, class, "%L/%N", 0))
	   || (file = search_magic_path (free_it, class, "%N", 0)))))
    {
      XrmDatabase db = XrmGetFileDatabase (file);
      xfree (file);
      xfree (free_it);
      return db;
    }

  xfree (free_it);
  return NULL;
}


static XrmDatabase

    {
      char *home;
      char *xdefault;

      home = gethomedir ();
      xdefault = (char *) xmalloc (strlen (home) + sizeof (".Xdefaults"));
      strcpy (xdefault, home);
      strcat (xdefault, ".Xdefaults");
      db = XrmGetFileDatabase (xdefault);
      xfree (home);
      xfree (xdefault);
    }

#ifdef HAVE_XSCREENRESOURCESTRING
  /* Get the screen-specific resources too.  */
  xdefs = XScreenResourceString (DefaultScreenOfDisplay (display));

  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);
      p = path;
    }

  db = XrmGetFileDatabase (p);

  xfree (path);
  xfree (home);

  return db;
}

/* External interface.  */

  user_database = get_user_db (display);

  /* Figure out what the "customization string" is, so we can use it
     to decode paths.  */
  xfree (x_customization_string);
  x_customization_string
    = x_get_customization_string (user_database, myname, myclass);

  /* Get application system defaults */
  db = get_system_app (myclass);