kc3-lang/gnulib/lib/version-etc.c

• Show log

  Commit

• Hash : 14bf04a5
  Author :
  Date : 2006-01-09T23:13:56
  

  Sync from coreutils.
  
  * doc/getdate.texi (General date syntax): Invalid dates are rejected.
  (Time of day items): Mention the possibility of leap seconds.
  Problem reported by Dr. David Alan Gilbert.
  
  * lib/chdir-long.c (cdb_free): Don't bother trying to open directory
  for write access: POSIX says that must fail.
  * lib/fts.c (diropen): Likewise.
  * lib/save-cwd.c (save_cwd): Likewise.
  * lib/chdir-long.c (cdb_free): Open with O_NOCTTY | O_NONBLOCK as
  well, for minor improvements on hosts that lack O_DIRECTORY.
  
  * lib/gettime.c (gettime) [!defined OK_TO_USE_1S_CLOCK]:
  Report an error at compile-time if only a 1-second nominal clock
  resolution is found.
  
  * lib/lchmod.h: New file.
  * lib/mkdir-p.c: Include lchmod.h, lchown.h.
  (make_dir_parents): Use lchown rather than chown, and
  lchmod rather than chmod.
  
  * lib/mountlist.c (ME_DUMMY): "none" and "proc" file systems are dummies
  too.  Problem with "none" reported by Bob Proulx.  Problem with
  "proc" reported by n0dalus.
  
  * lib/mountlist.c: Include <limits.h>.
  (dev_from_mount_options)
  [defined MOUNTED_GETMNTENT1 || defined MOUNTED_GETMNTENT2]:
  New function.  It no longer assumes "dev=" has the System V meaning
  on Linux (since it doesn't).  It also parses "dev=" more carefully.
  (read_file_system_list)
  [defined MOUNTED_GETMNTENT1 || defined MOUNTED_GETMNTENT2]: Use it.
  MOUNTED_GETMNTENT2 is new here; the code didn't used to look for
  dev= in that case.
  
  * lib/posixtm.h (PDS_PRE_2000): New macro.
  * lib/posixtm.c (year): Arg is now syntax_bits rather than allow_century.
  All usages changed.  Reject dates outside the range 1969-1999 if
  PDS_PRE_2000 is used.
  
  * modules/mkdir-p (Files): Add chdir-safer.c, chdir-safer.h, lchmod.h,
  chdir-safer.m4, lchmod.m4.
  * modules/openat: Add mkdirat.c, openat-priv.h.
  * modules/lib-ignore: New file.
  
  * lib/version-etc.c (COPYRIGHT_YEAR): Update to 2006.
  
  Rewrite fts.c not to change the current working directory,
  by using openat, fstatat, fdopendir, etc..
  
  * lib/fts.c [! _LIBC]: Include "openat.h", "unistd--.h", and "fcntl--.h".
  [_LIBC] (fchdir): Don't undef or define; no longer used.
  (FCHDIR): Define in terms of cwd_advance_fd rather than fchdir.
  Now, this `function' always succeeds, and consumes its file descriptor
  parameter -- so callers must not close such FDs.  Update callers.
  (diropen_fd, opendirat, cwd_advance_fd): New functions.
  (diropen): Add parameter, SP.  Adjust all callers.
  Implement using diropen_fd, rather than open.
  (fts_open): Initialize new member, fts_cwd_fd.
  Remove fts_rft-setting code.
  (fts_close): Close fts_cwd_fd, if necessary.
  (__opendir2): Define in terms of opendir or opendirat,
  depending on whether the FST_NOCHDIR flag is set.
  (fts_build): Since fts_safe_changedir consumes its FD, and since
  this code must do `closedir(dirp)', dup the dirfd(dirp) argument,
  and close the dup'd file descriptor upon failure.
  (fts_stat): Use fstatat(...AT_SYMLINK_NOFOLLOW) in place of lstat.
  (fts_safe_changedir): Tweak semantics to reflect that this function
  now calls cwd_advance_fd and hence consumes its FD argument.
  * lib/fts_.h [struct FTS] (fts_cwd_fd): New member.
  (fts_rft): Remove now-unused member.
  
  * lib/openat.c (fchownat): New function.
  * lib/openat.h (fchmodat, fchownat): Declare.
  (chmodat, lchmodat): Define convenience functions.
  (chownat, lchownat): Likewise.
  
  * lib/chdir-safer.h, chdir-safer.c: New files.
  
  * lib/modechange.c (mode_compile): Reject an invalid mode string
  that starts with an octal digit.  From Andreas Gruenbacher.
  
  * lib/openat.c: Include "fcntl--.h" and "unistd--.h", to map open
  and dup to open_safer and dup_safer, respectively.
  (openat_permissive): Fix typo in comment.
  
  * lib/openat.c: Don't include <stdlib.h>, <unistd.h>, <fcntl.h>,
  "gettext.h"; either no longer needed or are guaranteed by openat.h.
  (_): Remove; no longer needed.
  (openat): Renamed from rpl_openat; no need for rpl_openat
  since openat.h renames openat for us.
  Replace most of the body with a call to openat_permissive,
  to avoid duplicate code.
  Port to (probably hypothetical) environments were mode_t is
  wider than int.
  (openat_permissive): Require mode arg, so that we can check
  types better.  Put it just after flags.  Change cwd failure
  indicator from pointer-to-bool to pointer-to-errno-value.
  All callers changed.
  Invoke openat_save_fail and/or openat_restore_fail if
  cwd_errno is null, so that openat can call us.
  (openat_permissive, fdopendir, fstatat, unlinkat):
  Simplify errno handling to avoid some duplicate code,
  as it's OK to set errno on success.
  * lib/openat.h: Revamp code so that function macros depend on
  __OPENAT_PREFIX only, not also on AT_FDCWD.
  (openat_ro): Remove.  Caller changed to use openat_permissive.
  (openat_permissive): Now a macro, if not a function.
  (openat_restore_fail, openat_save_fail): Now always functions,
  since mkdirat needs them even if __OPENAT_PREFIX is defined.
  
  * lib/openat-priv.h: New file, defining macros used by mkdirat.c
  and openat.c.
  * lib/mkdirat.c: Include openat-priv.h.
  Remove definitions of macros defined therein.
  * lib/openat.c: Likewise.
  
  * lib/mkdirat.c (mkdirat): New file and function.
  * lib/openat.h (mkdirat): Declare.
  
  * lib/openat.c (fdopendir): Don't change errno when returning non-NULL.
  
  * lib/openat.h (openat_permissive): Declare.
  (openat_ro): Define.
  
  * lib/openat.c (EXPECTED_ERRNO): New macro.
  (openat_permissive): New function -- used in remove.c rewrite.
  (all functions): Set errno just before returning, only if there
  was an actual failure.
  Use EXPECTED_ERRNO rather than comparing against only ENOTDIR.
  
  Emulate openat-family functions using Linux's procfs, if possible.
  Idea and some code based on Ulrich Drepper's glibc changes.
  
  * lib/openat.c: (BUILD_PROC_NAME): New macro.
  Include <stdio.h>, <string.h>, "alloca.h" and "intprops.h".
  (rpl_openat): Emulate by trying to open /proc/self/fd/%d/%s,
  before falling back on save_cwd and restore_cwd.
  (fdopendir, fstatat, unlinkat): Likewise.
  
  * lib/openat.c (fstatat, unlinkat): Perform the syscall directly,
  skipping the save_cwd...restore_cwd overhead, if FILE is absolute.
  
  * lib/openat.c (rpl_openat): Use the promoted type (int), not mode_t,
  as second argument to va_arg.  Otherwise, some versions of gcc
  warn that `if this code is reached, the program will abort'.
  
  Add POSIX ACL support
  * lib/acl.h (copy_acl, set_acl): Add declarations.
  * lib/acl.c (acl_entries): Add fallback implementation for POSIX ACL
  systems other than Linux.
  (chmod_or_fchmod): New function: use fchmod when possible,
  and chmod otherwise.
  (file_has_acl): Add a POSIX ACL implementation, with a
  Linux-specific subcase.
  (copy_acl): Add: copy an acl and S_ISUID, S_ISGID, and
  S_ISVTX from one file to another.  Fall back to fchmod/chmod when
  acls are unsupported.
  (set_acl): Add: set a file's acl and S_ISUID, S_ISGID, and
  S_ISVTX to a defined value.  Fall back to fchmod/chmod when acls
  are unsupported.
  
  * m4/lib-ignore.m4: New file.
  * m4/lchmod.m4: New file.
  
  * m4/chdir-safer.m4: New file.
  * m4/openat.m4 (gl_FUNC_OPENAT): Require and compile mkdirat.c.
  Require openat-priv.h.
  
  * m4/acl.m4 (AC_FUNC_ACL): Add POSIX ACL and Linux-specific acl tests.
  

Download

• lib/version-etc.c

• /* Utility to help print --version output in a consistent format.
     Copyright (C) 1999-2006 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
     the Free Software Foundation; either version 2, or (at your option)
     any later version.
  
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
  
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software Foundation,
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
  
  /* Written by Jim Meyering. */
  
  #ifdef HAVE_CONFIG_H
  # include <config.h>
  #endif
  
  /* Specification.  */
  #include "version-etc.h"
  
  #include <stdarg.h>
  #include <stdio.h>
  #include <stdlib.h>
  
  #if USE_UNLOCKED_IO
  # include "unlocked-io.h"
  #endif
  
  #include "gettext.h"
  #define _(msgid) gettext (msgid)
  
  enum { COPYRIGHT_YEAR = 2006 };
  
  /* Like version_etc, below, but with the NULL-terminated author list
     provided via a variable of type va_list.  */
  void
  version_etc_va (FILE *stream,
  		const char *command_name, const char *package,
  		const char *version, va_list authors)
  {
    size_t n_authors;
  
    /* Count the number of authors.  */
    {
      va_list tmp_authors;
  
  #ifdef __va_copy
      __va_copy (tmp_authors, authors);
  #else
      tmp_authors = authors;
  #endif
  
      n_authors = 0;
      while (va_arg (tmp_authors, const char *) != NULL)
        ++n_authors;
    }
  
    if (command_name)
      fprintf (stream, "%s (%s) %s\n", command_name, package, version);
    else
      fprintf (stream, "%s %s\n", package, version);
  
    /* TRANSLATORS: Translate "(C)" to the copyright symbol
       (C-in-a-circle), if this symbol is available in the user's
       locale.  Otherwise, do not translate "(C)"; leave it as-is.  */
    fprintf (stream, version_etc_copyright, _("(C)"), COPYRIGHT_YEAR);
  
    fputs (_("\
  \n\
  This is free software.  You may redistribute copies of it under the terms of\n\
  the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n\
  There is NO WARRANTY, to the extent permitted by law.\n\
  \n\
  "),
  	 stream);
  
    switch (n_authors)
      {
      case 0:
        /* The caller must provide at least one author name.  */
        abort ();
      case 1:
        /* TRANSLATORS: %s denotes an author name.  */
        vfprintf (stream, _("Written by %s.\n"), authors);
        break;
      case 2:
        /* TRANSLATORS: Each %s denotes an author name.  */
        vfprintf (stream, _("Written by %s and %s.\n"), authors);
        break;
      case 3:
        /* TRANSLATORS: Each %s denotes an author name.  */
        vfprintf (stream, _("Written by %s, %s, and %s.\n"), authors);
        break;
      case 4:
        /* TRANSLATORS: Each %s denotes an author name.
  	 You can use line breaks, estimating that each author name occupies
  	 ca. 16 screen columns and that a screen line has ca. 80 columns.  */
        vfprintf (stream, _("Written by %s, %s, %s,\nand %s.\n"), authors);
        break;
      case 5:
        /* TRANSLATORS: Each %s denotes an author name.
  	 You can use line breaks, estimating that each author name occupies
  	 ca. 16 screen columns and that a screen line has ca. 80 columns.  */
        vfprintf (stream, _("Written by %s, %s, %s,\n%s, and %s.\n"), authors);
        break;
      case 6:
        /* TRANSLATORS: Each %s denotes an author name.
  	 You can use line breaks, estimating that each author name occupies
  	 ca. 16 screen columns and that a screen line has ca. 80 columns.  */
        vfprintf (stream, _("Written by %s, %s, %s,\n%s, %s, and %s.\n"),
  		authors);
        break;
      case 7:
        /* TRANSLATORS: Each %s denotes an author name.
  	 You can use line breaks, estimating that each author name occupies
  	 ca. 16 screen columns and that a screen line has ca. 80 columns.  */
        vfprintf (stream, _("Written by %s, %s, %s,\n%s, %s, %s, and %s.\n"),
  		authors);
        break;
      case 8:
        /* TRANSLATORS: Each %s denotes an author name.
  	 You can use line breaks, estimating that each author name occupies
  	 ca. 16 screen columns and that a screen line has ca. 80 columns.  */
        vfprintf (stream, _("\
  Written by %s, %s, %s,\n%s, %s, %s, %s,\nand %s.\n"),
  		authors);
        break;
      case 9:
        /* TRANSLATORS: Each %s denotes an author name.
  	 You can use line breaks, estimating that each author name occupies
  	 ca. 16 screen columns and that a screen line has ca. 80 columns.  */
        vfprintf (stream, _("\
  Written by %s, %s, %s,\n%s, %s, %s, %s,\n%s, and %s.\n"),
  		authors);
        break;
      default:
        /* 10 or more authors.  Use an abbreviation, since the human reader
  	 will probably not want to read the entire list anyway.  */
        /* TRANSLATORS: Each %s denotes an author name.
  	 You can use line breaks, estimating that each author name occupies
  	 ca. 16 screen columns and that a screen line has ca. 80 columns.  */
        vfprintf (stream, _("\
  Written by %s, %s, %s,\n%s, %s, %s, %s,\n%s, %s, and others.\n"),
  		authors);
        break;
      }
    va_end (authors);
  }
  
  
  /* Display the --version information the standard way.
  
     If COMMAND_NAME is NULL, the PACKAGE is asumed to be the name of
     the program.  The formats are therefore:
  
     PACKAGE VERSION
  
     or
  
     COMMAND_NAME (PACKAGE) VERSION.
  
     The author names are passed as separate arguments, with an additional
     NULL argument at the end.  */
  void
  version_etc (FILE *stream,
  	     const char *command_name, const char *package,
  	     const char *version, /* const char *author1, ...*/ ...)
  {
    va_list authors;
  
    va_start (authors, version);
    version_etc_va (stream, command_name, package, version, authors);
  }
  

Download