X Strike Force SVN commit: rev 313 - trunk/debian/patches
Author: branden
Date: 2003-07-24 14:42:36 -0500 (Thu, 24 Jul 2003)
New Revision: 313
Modified:
trunk/debian/patches/000_stolen_from_HEAD_xlib.diff
Log:
debian/patches/000_stolen_from_HEAD_xlib.diff: oops; forgot to nuke earlier
patch to lcFile.c, now incorporated into later patch in this file
Modified: trunk/debian/patches/000_stolen_from_HEAD_xlib.diff
==============================================================================
--- trunk/debian/patches/000_stolen_from_HEAD_xlib.diff 2003-07-24 19:36:25 UTC (rev 312)
+++ trunk/debian/patches/000_stolen_from_HEAD_xlib.diff 2003-07-24 19:42:36 UTC (rev 313)
@@ -1406,121 +1406,6 @@
return lcd;
}
---- xc/lib/X11/lcFile.c 4 Sep 2002 02:38:09 -0000 3.25.4.1
-+++ xc/lib/X11/lcFile.c 25 Nov 2002 14:04:53 -0000 3.30
-@@ -433,53 +433,63 @@
- char *dir_name;
- char *lc_name;
- {
-- char dir[PATH_MAX], buf[PATH_MAX], *name = NULL;
-- int i, n;
-- char *args[NUM_LOCALEDIR];
-- static char locale_alias[] = LOCALE_ALIAS;
-- char *target_name = (char*)0;
-- char *target_dir = (char*)0;
--
-- xlocaledir (dir, PATH_MAX);
-- n = _XlcParsePath(dir, args, 256);
-- for (i = 0; i < n; ++i){
-- if ((2 + (args[i] ? strlen(args[i]) : 0) +
-- strlen(locale_alias)) < PATH_MAX) {
-- sprintf (buf, "%s/%s", args[i], locale_alias);
-- name = resolve_name(lc_name, buf, LtoR);
-- }
--
-- /* If name is not an alias, use lc_name for locale.dir search */
-- if (name == NULL)
-- name = lc_name;
--
-- /* look at locale.dir */
--
-- target_dir = args[i];
-- if (!target_dir) {
-- /* something wrong */
-- continue;
-- }
-- if ((1 + (target_dir ? strlen (target_dir) : 0) +
-- strlen("locale.dir")) < PATH_MAX) {
-- sprintf(buf, "%s/locale.dir", target_dir);
-- target_name = resolve_name(name, buf, RtoL);
-- }
-- if (target_name != NULL) {
-- char *p = 0;
-- if ((p = strstr(target_name, "/XLC_LOCALE"))) {
-- *p = '\0';
-- break;
-- }
-- }
-- }
-- if (target_name == NULL) {
-- /* vendor locale name == Xlocale name, no expansion of alias */
-- target_dir = args[0];
-- target_name = lc_name;
-- }
-- strcpy(dir_name, target_dir);
-- strcat(dir_name, "/");
-- strcat(dir_name, target_name);
-- return dir_name;
-+ char dir[PATH_MAX], buf[PATH_MAX], *name = NULL;
-+ int i, n;
-+ char *args[NUM_LOCALEDIR];
-+ static char locale_alias[] = LOCALE_ALIAS;
-+ char *target_name = (char*)0;
-+ char *target_dir = (char*)0;
-+
-+ xlocaledir (dir, PATH_MAX);
-+ n = _XlcParsePath(dir, args, 256);
-+ for (i = 0; i < n; ++i) {
-+
-+ if ((2 + (args[i] ? strlen(args[i]) : 0) +
-+ strlen(locale_alias)) < PATH_MAX) {
-+ sprintf (buf, "%s/%s", args[i], locale_alias);
-+ name = resolve_name(lc_name, buf, LtoR);
-+ }
-+
-+ /* If name is not an alias, use lc_name for locale.dir search */
-+ if (name == NULL)
-+ name = lc_name;
-+
-+ /* look at locale.dir */
-+
-+ target_dir = args[i];
-+ if (!target_dir) {
-+ /* something wrong */
-+ if (name != lc_name)
-+ Xfree(name);
-+ continue;
-+ }
-+ if ((1 + (target_dir ? strlen (target_dir) : 0) +
-+ strlen("locale.dir")) < PATH_MAX) {
-+ sprintf(buf, "%s/locale.dir", target_dir);
-+ target_name = resolve_name(name, buf, RtoL);
-+ }
-+ if (name != lc_name)
-+ Xfree(name);
-+ if (target_name != NULL) {
-+ char *p = 0;
-+ if ((p = strstr(target_name, "/XLC_LOCALE"))) {
-+ *p = '\0';
-+ break;
-+ }
-+ Xfree(target_name);
-+ target_name = NULL;
-+ }
-+ name = NULL;
-+ }
-+ if (target_name == NULL) {
-+ /* vendor locale name == Xlocale name, no expansion of alias */
-+ target_dir = args[0];
-+ target_name = lc_name;
-+ }
-+ strcpy(dir_name, target_dir);
-+ strcat(dir_name, "/");
-+ strcat(dir_name, target_name);
-+ if (target_name != lc_name)
-+ Xfree(target_name);
-+ return dir_name;
- }
Index: xc/lib/X11/lcGenConv.c
===================================================================
RCS file: /home/branden/packages/xfree86/cvsup/xc/lib/X11/lcGenConv.c,v
Reply to: