*** empty log message ***

diff --git a/Makerules b/Makerules
index 21b260c..9ab3a65 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -621,6 +621,10 @@ check: tests
 TAGS: distinfo $(..)MakeTAGS
        $(MAKE) $(addprefix -f ,$^) $@
 
+$(..)po/%.pot: distinfo $(..)MakeTAGS
+       $(MAKE) $(addprefix -f ,$^) $@
+
+
 .PHONY: echo-headers
 echo-headers:
        @echo $(headers)

diff --git a/intl/Makefile b/intl/Makefile
index adc4d01..0354b42 100644 (file)
--- a/intl/Makefile
+++ b/intl/Makefile
@@ -31,9 +31,9 @@ CPPFLAGS += -D'GNULOCALEDIR="$(localedir)"' \
 
 ifdef gettext-srcdir
 
-%:: $(gettext-srcdir)/intl/%.glibc; $(copysrc)
-%:: $(gettext-srcdir)/intl/%.c; $(copysrc)
-%:: $(gettext-srcdir)/intl/%.h; $(copysrc)
+%.h:: $(gettext-srcdir)/intl/%.glibc; $(copysrc)
+%.c:: $(gettext-srcdir)/intl/%.c; $(copysrc)
+%.h:: $(gettext-srcdir)/intl/%.h; $(copysrc)
 
 define copysrc
 cp -f $< $@.new

diff --git a/intl/dcgettext.c b/intl/dcgettext.c
index 09e0443..7562f69 100644 (file)
--- a/intl/dcgettext.c
+++ b/intl/dcgettext.c
@@ -1,5 +1,5 @@
-/* dcgettext.c -- implemenatation of the dcgettext(3) function
-   Copyright (C) 1995 Software Foundation, Inc.
+/* dcgettext.c -- implementation of the dcgettext(3) function
+   Copyright (C) 1995 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #ifdef __GNUC__
 # define alloca __builtin_alloca
 #else
-# ifdef HAVE_ALLOCA_H || defined _LIBC
+# if defined HAVE_ALLOCA_H || defined _LIBC
 #  include <alloca.h>
 # else
 #  ifdef _AIX
@@ -151,10 +151,11 @@ const char _nl_default_dirname[] = GNULOCALEDIR;
 struct binding *_nl_domain_bindings;
 
 /* Prototypes for local functions.  */
-static char *find_msg __P ((struct loaded_domain *domain, const char *msgid));
-static const char *category_to_name __P((int category));
-static const char *guess_category_value __P((int category,
-                                            const char *categoryname));
+static char *find_msg PARAMS ((struct loaded_domain *domain,
+                              const char *msgid));
+static const char *category_to_name PARAMS ((int category));
+static const char *guess_category_value PARAMS ((int category,
+                                                const char *categoryname));
 
 
 /* Names for the libintl functions are a problem.  They must not clash
@@ -182,6 +183,7 @@ DCGETTEXT (domainname, msgid, category)
   char *dirname, *xdomainname;
   char *single_locale;
   char *retval;
+  int saved_errno = errno;
 
   /* If no real MSGID is given return NULL.  */
   if (msgid == NULL)
@@ -233,9 +235,12 @@ DCGETTEXT (domainname, msgid, category)
        }
 
       if (ret == NULL)
-       /* We cannot get the current working directory.  Don't signal an
-          error but simply return the default string.  */
-       return (char *) msgid;
+       {
+         /* We cannot get the current working directory.  Don't signal an
+            error but simply return the default string.  */
+         errno = saved_errno;
+         return (char *) msgid;
+       }
 
       /* We don't want libintl.a to depend on any other library.  So
         we avoid the non-standard function stpcpy.  In GNU C Library
@@ -302,7 +307,10 @@ DCGETTEXT (domainname, msgid, category)
         domain.  Return the MSGID.  */
       if (strcmp (single_locale, "C") == 0
          || strcmp (single_locale, "POSIX") == 0)
-       return (char *) msgid;
+       {
+         errno = saved_errno;
+         return (char *) msgid;
+       }
 
 
       /* Find structure describing the message catalog matching the
@@ -317,7 +325,7 @@ DCGETTEXT (domainname, msgid, category)
            {
              int cnt;
 
-             for (cnt = 0; domain->successor[cnt] != NULL; --cnt)
+             for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
                {
                  retval = find_msg (domain->successor[cnt], msgid);
 
@@ -327,7 +335,10 @@ DCGETTEXT (domainname, msgid, category)
            }
 
          if (retval != NULL)
-           return retval;
+           {
+             errno = saved_errno;
+             return retval;
+           }
        }
     }
   /* NOTREACHED */
@@ -375,8 +386,8 @@ find_msg (domain, msgid)
 
       while (1)
        {
-         if (idx >= W (domain->must_swap, domain->hash_size) - incr)
-           idx -= W (domain->must_swap, domain->hash_size) - incr;
+         if (idx >= domain->hash_size - incr)
+           idx -= domain->hash_size - incr;
          else
            idx += incr;
 

diff --git a/sysdeps/unix/closedir.c b/sysdeps/unix/closedir.c
index 5f1ac74..6acbb62 100644 (file)
--- a/sysdeps/unix/closedir.c
+++ b/sysdeps/unix/closedir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1993, 1995, 1996 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -37,9 +37,9 @@ DEFUN(closedir, (dirp), DIR *dirp)
       return -1;
     }
 
-  fd = dirp->__fd;
+  fd = dirp->fd;
 
-  free ((PTR) dirp->__data);
+  free ((PTR) dirp->data);
   free ((PTR) dirp);
 
   return __close (fd);

diff --git a/sysdeps/unix/dirstream.h b/sysdeps/unix/dirstream.h
index 72fd67c..52d2337 100644 (file)
--- a/sysdeps/unix/dirstream.h
+++ b/sysdeps/unix/dirstream.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995, 1996 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -20,8 +20,7 @@ Cambridge, MA 02139, USA.  */
 
 #define        _DIRSTREAM_H    1
 
-#define __need_size_t
-#include <stddef.h>
+#include <sys/types.h>
 
 /* Directory stream type.
 
@@ -37,7 +36,7 @@ struct __dirstream
     size_t __offset;           /* Current offset into the block.  */
     size_t __size;             /* Total valid data in the block.  */
 
-    struct dirent __entry;     /* Returned by `readdir'.  */
+    off_t pos;                 /* Position of next entry to read.  */
   };
 
 #define _DIR_dirfd(dirp)       ((dirp)->__fd)

diff --git a/sysdeps/unix/opendir.c b/sysdeps/unix/opendir.c
index 5cd6206..31111e8 100644 (file)
--- a/sysdeps/unix/opendir.c
+++ b/sysdeps/unix/opendir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -16,7 +16,6 @@ License along with the GNU C Library; see the file COPYING.LIB.  If
 not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
-#include <ansidecl.h>
 #include <errno.h>
 #include <limits.h>
 #include <stddef.h>
@@ -28,12 +27,11 @@ Cambridge, MA 02139, USA.  */
 #include <unistd.h>
 #include <stdio.h>
 
-#include "direct.h"            /* This file defines `struct direct'.  */
 #include "dirstream.h"
 
 /* Open a directory stream on NAME.  */
 DIR *
-DEFUN(opendir, (name), CONST char *name)
+opendir (const char *name)
 {
   DIR *dirp;
   struct stat statbuf;
@@ -62,7 +60,7 @@ DEFUN(opendir, (name), CONST char *name)
       goto lose;
     }
 
-  dirp = (DIR *) calloc (1, sizeof (DIR) + NAME_MAX); /* Zero-fill.  */
+  dirp = (DIR *) calloc (1, sizeof (DIR)); /* Zero-fill.  */
   if (dirp == NULL)
   lose:
     {
@@ -73,24 +71,24 @@ DEFUN(opendir, (name), CONST char *name)
     }
 
 #ifdef _STATBUF_ST_BLKSIZE
-  if (statbuf.st_blksize < sizeof (struct direct))
-    dirp->__allocation = sizeof (struct direct);
+  if (statbuf.st_blksize < sizeof (struct dirent))
+    dirp->allocation = sizeof (struct dirent);
   else
-    dirp->__allocation = statbuf.st_blksize;
+    dirp->allocation = statbuf.st_blksize;
 #else
-  dirp->__allocation = (BUFSIZ < sizeof (struct direct) ?
-                       sizeof (struct direct) : BUFSIZ);
+  dirp->allocation = (BUFSIZ < sizeof (struct dirent) ?
+                     sizeof (struct dirent) : BUFSIZ);
 #endif
-  dirp->__data = (char *) malloc (dirp->__allocation);
-  if (dirp->__data == NULL)
+  dirp->data = (char *) malloc (dirp->allocation);
+  if (dirp->data == NULL)
     {
       int save = errno;
-      free ((PTR) dirp);
+      free (dirp);
       (void) __close (fd);
       errno = save;
       return NULL;
     }
 
-  dirp->__fd = fd;
+  dirp->fd = fd;
   return dirp;
 }

diff --git a/sysdeps/unix/readdir.c b/sysdeps/unix/readdir.c
index 1842948..b1d7e43 100644 (file)
--- a/sysdeps/unix/readdir.c
+++ b/sysdeps/unix/readdir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -77,6 +77,8 @@ DEFUN(readdir, (dirp), DIR *dirp)
          p = memchr ((PTR) dp->d_name, '\0', D_NAMLEN (dp) + 1);
          d->d_namlen = (p != NULL) ? p - dp->d_name : D_NAMLEN (dp);
          memcpy (d->d_name, dp->d_name, d->d_namlen + 1);
+         d->d_type = DT_UNKNOWN;
+         d->d_reclen = &d->d_name[d->d_namlen + 1] - (char *) d;
          return d;
        }
     }

diff --git a/sysdeps/unix/seekdir.c b/sysdeps/unix/seekdir.c
index 018f697..02390d7 100644 (file)
--- a/sysdeps/unix/seekdir.c
+++ b/sysdeps/unix/seekdir.c
@@ -27,7 +27,7 @@ Cambridge, MA 02139, USA.  */
 void
 DEFUN(seekdir, (dirp, pos), DIR *dirp AND __off_t pos)
 {
-  (void) __lseek(dirp->__fd, pos, SEEK_SET);
-  dirp->__size = 0;
-  dirp->__offset = 0;
+  (void) __lseek(dirp->fd, pos, SEEK_SET);
+  dirp->size = 0;
+  dirp->offset = 0;
 }

diff --git a/sysdeps/unix/telldir.c b/sysdeps/unix/telldir.c
index 2b611b0..c319d71 100644 (file)
--- a/sysdeps/unix/telldir.c
+++ b/sysdeps/unix/telldir.c
@@ -36,8 +36,8 @@ DEFUN(telldir, (dirp), DIR *dirp)
       return (off_t) -1;
     }
 
-  pos = __lseek(dirp->__fd, (off_t) 0, SEEK_CUR);
+  pos = __lseek(dirp->fd, (off_t) 0, SEEK_CUR);
   if (pos == (off_t) -1)
     return (off_t) -1;
-  return pos + dirp->__size - dirp->__offset;
+  return pos + dirp->size - dirp->offset;
 }