int
-xxfnmatch (const char *pattern, const char *string, int flags)
+fnmatch (const char *pattern, const char *string, int flags)
{
return internal_fnmatch (pattern, string, flags & FNM_PERIOD, flags);
}
/* Match NAME against the filename pattern PATTERN,
returning zero if it matches, FNM_NOMATCH if not. */
-extern int xxfnmatch __P ((__const char *__pattern, __const char *__name,
+extern int fnmatch __P ((__const char *__pattern, __const char *__name,
int __flags));
#ifdef __cplusplus
# include <assert.h>
-#define __xxalloca alloca
+#define __alloca alloca
#define __stat stat
#define NAMLEN(_d) NLENGTH(_d)
If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned.
Otherwise, `glob' returns zero. */
int
-xxglob (const char *pattern, int flags,
+glob (const char *pattern, int flags,
int (*errfunc) __P ((const char *, int)), glob_t *pglob)
{
const char *filename;
if (onealt == NULL)
{
if (!(flags & GLOB_APPEND))
- xxglobfree (pglob);
+ globfree (pglob);
return GLOB_NOSPACE;
}
#endif
#ifndef __GNUC__
free (onealt);
#endif
- return xxglob (pattern, flags & ~GLOB_BRACE, errfunc, pglob);
+ return glob (pattern, flags & ~GLOB_BRACE, errfunc, pglob);
}
/* Now find the end of the whole brace expression. */
#ifndef __GNUC__
free (onealt);
#endif
- return xxglob (pattern, flags & ~GLOB_BRACE, errfunc, pglob);
+ return glob (pattern, flags & ~GLOB_BRACE, errfunc, pglob);
}
}
/* Please note that we now can be sure the brace expression
memcpy (&alt_start[next - p], rest, rest_len);
#endif
- result = xxglob (onealt,
+ result = glob (onealt,
((flags & ~(GLOB_NOCHECK|GLOB_NOMAGIC))
| GLOB_APPEND), errfunc, pglob);
free (onealt);
#endif
if (!(flags & GLOB_APPEND))
- xxglobfree (pglob);
+ globfree (pglob);
return result;
}
char *drive_spec;
++dirlen;
- drive_spec = (char *) __xxalloca (dirlen + 1);
+ drive_spec = (char *) __alloca (dirlen + 1);
#ifdef HAVE_MEMPCPY
*((char *) mempcpy (drive_spec, pattern, dirlen)) = '\0';
#else
from "d:/", since "d:" and "d:/" are not the same.*/
}
#endif
- newp = (char *) __xxalloca (dirlen + 1);
+ newp = (char *) __alloca (dirlen + 1);
#ifdef HAVE_MEMPCPY
*((char *) mempcpy (newp, pattern, dirlen)) = '\0';
#else
&& dirlen > 1)
/* "pattern/". Expand "pattern", appending slashes. */
{
- int val = xxglob (dirname, flags | GLOB_MARK, errfunc, pglob);
+ int val = glob (dirname, flags | GLOB_MARK, errfunc, pglob);
if (val == 0)
pglob->gl_flags = ((pglob->gl_flags & ~GLOB_MARK)
| (flags & GLOB_MARK));
/* `sysconf' does not support _SC_LOGIN_NAME_MAX. Try
a moderate value. */
buflen = 20;
- name = (char *) __xxalloca (buflen);
+ name = (char *) __alloca (buflen);
success = getlogin_r (name, buflen) >= 0;
# else
/* `sysconf' does not support _SC_GETPW_R_SIZE_MAX.
Try a moderate value. */
pwbuflen = 1024;
- pwtmpbuf = (char *) __xxalloca (pwbuflen);
+ pwtmpbuf = (char *) __alloca (pwbuflen);
while (getpwnam_r (name, &pwbuf, pwtmpbuf, pwbuflen, &p)
!= 0)
break;
}
pwbuflen *= 2;
- pwtmpbuf = (char *) __xxalloca (pwbuflen);
+ pwtmpbuf = (char *) __alloca (pwbuflen);
__set_errno (save);
}
# else
{
char *newp;
size_t home_len = strlen (home_dir);
- newp = (char *) __xxalloca (home_len + dirlen);
+ newp = (char *) __alloca (home_len + dirlen);
# ifdef HAVE_MEMPCPY
mempcpy (mempcpy (newp, home_dir, home_len),
&dirname[1], dirlen);
else
{
char *newp;
- newp = (char *) __xxalloca (end_name - dirname);
+ newp = (char *) __alloca (end_name - dirname);
# ifdef HAVE_MEMPCPY
*((char *) mempcpy (newp, dirname + 1, end_name - dirname))
= '\0';
/* `sysconf' does not support _SC_GETPW_R_SIZE_MAX. Try a
moderate value. */
buflen = 1024;
- pwtmpbuf = (char *) __xxalloca (buflen);
+ pwtmpbuf = (char *) __alloca (buflen);
while (getpwnam_r (user_name, &pwbuf, pwtmpbuf, buflen, &p) != 0)
{
break;
}
buflen *= 2;
- pwtmpbuf = __xxalloca (buflen);
+ pwtmpbuf = __alloca (buflen);
__set_errno (save);
}
# else
char *newp;
size_t home_len = strlen (home_dir);
size_t rest_len = end_name == NULL ? 0 : strlen (end_name);
- newp = (char *) __xxalloca (home_len + rest_len + 1);
+ newp = (char *) __alloca (home_len + rest_len + 1);
# ifdef HAVE_MEMPCPY
*((char *) mempcpy (mempcpy (newp, home_dir, home_len),
end_name, rest_len)) = '\0';
dirs.gl_lstat = pglob->gl_lstat;
}
- status = xxglob (dirname,
+ status = glob (dirname,
((flags & (GLOB_ERR | GLOB_NOCHECK | GLOB_NOESCAPE
| GLOB_ALTDIRFUNC))
| GLOB_NOSORT | GLOB_ONLYDIR),
if (interrupt_state)
{
- xxglobfree (&dirs);
- xxglobfree (&files);
+ globfree (&dirs);
+ globfree (&files);
return GLOB_ABORTED;
}
}
if (status != 0)
{
- xxglobfree (&dirs);
- xxglobfree (pglob);
+ globfree (&dirs);
+ globfree (pglob);
return status;
}
&pglob->gl_pathv[old_pathc],
pglob->gl_pathc - old_pathc))
{
- xxglobfree (&dirs);
- xxglobfree (pglob);
+ globfree (&dirs);
+ globfree (pglob);
return GLOB_NOSPACE;
}
}
sizeof (char *));
if (pglob->gl_pathv == NULL)
{
- xxglobfree (&dirs);
+ globfree (&dirs);
return GLOB_NOSPACE;
}
+ filename_len);
if (pglob->gl_pathv[pglob->gl_pathc] == NULL)
{
- xxglobfree (&dirs);
- xxglobfree (pglob);
+ globfree (&dirs);
+ globfree (pglob);
return GLOB_NOSPACE;
}
return GLOB_NOMATCH;
}
- xxglobfree (&dirs);
+ globfree (&dirs);
}
else
{
&pglob->gl_pathv[ignore],
pglob->gl_pathc - ignore))
{
- xxglobfree (pglob);
+ globfree (pglob);
return GLOB_NOSPACE;
}
}
char *new = xrealloc (pglob->gl_pathv[i], len);
if (new == NULL)
{
- xxglobfree (pglob);
+ globfree (pglob);
return GLOB_NOSPACE;
}
strcpy (&new[len - 2], "/");
/* Free storage allocated in PGLOB by a previous `glob' call. */
void
-xxglobfree (glob_t *pglob)
+globfree (glob_t *pglob)
{
if (pglob->gl_pathv != NULL)
{
struct stat st;
size_t patlen = strlen (pattern);
size_t dirlen = strlen (directory);
- char *fullname = (char *) __xxalloca (dirlen + 1 + patlen + 1);
+ char *fullname = (char *) __alloca (dirlen + 1 + patlen + 1);
# ifdef HAVE_MEMPCPY
mempcpy (mempcpy (mempcpy (fullname, directory, dirlen),
{
/* This is a special case for matching directories like in
"*a/". */
- names = (struct globlink *) __xxalloca (sizeof (struct globlink));
+ names = (struct globlink *) __alloca (sizeof (struct globlink));
names->name = (char *) xmalloc (1);
if (names->name == NULL)
goto memory_error;
name = d->d_name;
- if (xxfnmatch (pattern, name, fnm_flags) == 0)
+ if (fnmatch (pattern, name, fnm_flags) == 0)
{
struct globlink *new = (struct globlink *)
- __xxalloca (sizeof (struct globlink));
+ __alloca (sizeof (struct globlink));
len = NAMLEN (d);
new->name = (char *) xmalloc (len + 1);
if (new->name == NULL)
{
size_t len = strlen (pattern);
nfound = 1;
- names = (struct globlink *) __xxalloca (sizeof (struct globlink));
+ names = (struct globlink *) __alloca (sizeof (struct globlink));
names->next = NULL;
names->name = (char *) xmalloc (len + 1);
if (names->name == NULL)
If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned.
Otherwise, `glob' returns zero. */
#if _FILE_OFFSET_BITS != 64
-extern int xxglob __P ((__const char *__pattern, int __flags,
+extern int glob __P ((__const char *__pattern, int __flags,
int (*__errfunc) (__const char *, int),
glob_t *__pglob));
/* Free storage allocated in PGLOB by a previous `glob' call. */
-extern void xxglobfree __P ((glob_t *__pglob));
+extern void globfree __P ((glob_t *__pglob));
#else
# if __GNUC__ >= 2
extern int glob __P ((__const char *__pattern, int __flags,
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 05:52-0500\n"
+"POT-Creation-Date: 2005-01-26 10:58-0500\n"
"PO-Revision-Date: 2001-07-24 10:02+0100\n"
"Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 05:52-0500\n"
+"POT-Creation-Date: 2005-01-26 10:58-0500\n"
"PO-Revision-Date: 2001-04-05 23:03GMT\n"
"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 05:52-0500\n"
+"POT-Creation-Date: 2005-01-26 10:58-0500\n"
"PO-Revision-Date: 1998-08-03 18:02+02:00\n"
"Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
"Language-Team: German <de@li.org>\n"
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 05:52-0500\n"
+"POT-Creation-Date: 2005-01-26 10:58-0500\n"
"PO-Revision-Date: 1998-05-02 21:41:47-0400\n"
"Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
"Language-Team: Finnish <linux@sot.com>\n"
msgstr ""
"Project-Id-Version: RPM 4.2.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 05:52-0500\n"
+"POT-Creation-Date: 2005-01-26 10:58-0500\n"
"PO-Revision-Date: 2003-07-06 01:36+0200\n"
"Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
"Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 05:52-0500\n"
+"POT-Creation-Date: 2005-01-26 10:58-0500\n"
"PO-Revision-Date: 2001-01-13 22:31+0100\n"
"Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 05:52-0500\n"
+"POT-Creation-Date: 2005-01-26 10:58-0500\n"
"PO-Revision-Date: 2001-07-12 13:25+0000\n"
"Last-Translator: Richard Allen <ra@hp.is>\n"
"Language-Team: is <kde-isl@mmedia.is>\n"
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 05:52-0500\n"
+"POT-Creation-Date: 2005-01-26 10:58-0500\n"
"PO-Revision-Date: 1999-12-01 22:49 +JST\n"
"Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
"Language-Team: JRPM <jrpm@linux.or.jp>\n"
msgstr ""
"Project-Id-Version: rpm 4.0.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 05:52-0500\n"
+"POT-Creation-Date: 2005-01-26 10:58-0500\n"
"PO-Revision-Date: 2002-03-04 17:17+0900\n"
"Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
"Language-Team: GNU Translation project <ko@li.org>\n"
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 05:52-0500\n"
+"POT-Creation-Date: 2005-01-26 10:58-0500\n"
"PO-Revision-Date: 2001-06-27 12:24+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian <no@li.org>\n"
msgstr ""
"Project-Id-Version: rpm 4.3-20030515\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 05:52-0500\n"
+"POT-Creation-Date: 2005-01-26 10:58-0500\n"
"PO-Revision-Date: 2003-06-08 22:42+0200\n"
"Last-Translator: Arkadiusz Miskiewicz <arekm@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
msgstr ""
"Project-Id-Version: rpm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 05:52-0500\n"
+"POT-Creation-Date: 2005-01-26 10:58-0500\n"
"PO-Revision-Date: 2002-02-14 10:51+0000\n"
"Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n"
"Language-Team: pt <morais@kde.org\n"
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 05:52-0500\n"
+"POT-Creation-Date: 2005-01-26 10:58-0500\n"
"PO-Revision-Date: 2004-02-29 07:48+0500\n"
"Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
"Language-Team: Brazilian Portuguese\n"
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 05:52-0500\n"
+"POT-Creation-Date: 2005-01-26 10:58-0500\n"
"PO-Revision-Date: 1999-04-10 12:00+EST\n"
"Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
"Language-Team: Romanian <ro@li.org>\n"
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 05:52-0500\n"
+"POT-Creation-Date: 2005-01-26 10:58-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 05:52-0500\n"
+"POT-Creation-Date: 2005-01-26 10:58-0500\n"
"PO-Revision-Date: 2002-08-27 13:36-0400\n"
"Last-Translator: Eugene Kanter, <eugene@blackcatlinux.com>\n"
"Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 05:52-0500\n"
+"POT-Creation-Date: 2005-01-26 10:58-0500\n"
"PO-Revision-Date: 1999-04-08 21:37+02:00\n"
"Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
"Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
# -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
# Copyright (C) 2000 Free Software Foundation, Inc.
# Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.389.2.10 2005/01/25 05:24:44 jbj Exp $
+# $Id: sl.po,v 1.389.2.11 2005/01/28 06:36:32 jbj Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 05:52-0500\n"
+"POT-Creation-Date: 2005-01-26 10:58-0500\n"
"PO-Revision-Date: 2000-10-08 19:05+0200\n"
"Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
"Language-Team: Slovenian <sl@li.org>\n"
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 05:52-0500\n"
+"POT-Creation-Date: 2005-01-26 10:58-0500\n"
"PO-Revision-Date: 2004-02-29 07:48+0500\n"
"Last-Translator: unknown\n"
"Language-Team: unknown\n"
msgstr ""
"Project-Id-Version: rpm 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 05:52-0500\n"
+"POT-Creation-Date: 2005-01-26 10:58-0500\n"
"PO-Revision-Date: 2003-02-05 12:40+0100\n"
"Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-24 05:52-0500\n"
+"POT-Creation-Date: 2005-01-26 10:58-0500\n"
"PO-Revision-Date: 2001-07-05 08:02+300\n"
"Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
"Language-Team: Turkish <tr@li.org>\n"
return -2;
/*@notreached@*/ break;
}
- return xxglob(pattern, flags, errfunc, pglob);
+ return glob(pattern, flags, errfunc, pglob);
}
void Globfree(glob_t *pglob)
{
if (_rpmio_debug)
fprintf(stderr, "*** Globfree(%p)\n", pglob);
- xxglobfree(pglob);
+ globfree(pglob);
}
DIR * Opendir(const char * path)
#endif
#if defined(USE_GNU_GLOB)
+#include "misc/fnmatch.h"
#include "misc/fnmatch.c"
+#include "misc/glob.h"
#include "misc/glob.c"
#endif