kc3-lang/gnulib/lib/rmdir.c

• Show log

  Commit

• Hash : 3d50b604
  Author :
  Date : 2011-02-25T10:52:37
  

  dirname: move m4/dos.m4 functionality into lib/dosname.h
  
  m4/dos.m4 needs to go.  It laboriously invokes the C compiler, and
  extracts symbols from it, puts them into config.h; but it's much
  easier to use the symbols directly.  filename.h already does this,
  but it disagrees with dos.m4 in some respects.  This patch
  introduces a different include file dosname.h that packages up
  dos.m4, and then later we can work on merging filename.h and
  dosname.h.  Applications that need only the easy-to-configure
  symbols should consider including dosname.h rather than dirname.h.
  * NEWS: Mention incompatible changes.
  * m4/dos.m4: Remove.
  * lib/dosname.h, modules/dosname: New files.
  * lib/dirname.h (ISSLASH, FILE_SYSTEM_PREFIX_LEN):
  (FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE):
  (IS_ABSOLUTE_FILE_NAME, IS_RELATIVE_FILE_NAME): Move to lib/dosname.h.
  * lib/at-func.c, lib/at-func2.c, lib/openat.c, lib/savewd.c:
  Include dosname.h, not dirname.h.
  * lib/rmdir.c, lib/stat.c, lib/unlink.c, lib/unlinkat.c:
  Include dosname.h, for definitions of symbols like ISSLASH
  that used to be in config.h.
  * m4/dirname.m4 (gl_DIRNAME_LGPL): Do not require gl_AC_DOS.
  * m4/rmdir.m4 (gl_FUNC_RMDIR): Likewise.
  * m4/stat.m4 (gl_FUNC_STAT): Likewise.
  * m4/unlink.m4 (gl_FUNC_UNLINK): Likewise.
  * modules/dirname-lgpl (Files): Omit m4/dos.m4.
  * modules/rmdir (Files): Likewise.
  * modules/stat (Files): Likewise.
  * modules/unlink (Files): Likewise.
  * modules/dirname-lgpl (Depends-on): Add dosname.
  * modules/lstat (Depends-on): Likewise.
  * modules/openat (Depends-on): Likewise.
  * modules/rmdir (Depends-on): Likewise.
  * modules/savewd (Depends-on): Likewise.
  * modules/stat (Depends-on): Likewise.
  * modules/unlink (Depends-on): Likewise.
  * modules/openat (Depends-on): Remove dirname-lgpl.
  * modules/savewd (Depends-on): Likewise.
  * tests/test-dirname.c: Do not use removed symbols like
  FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR.  Instead, use
  the remaining symbols, e.g., ISSLASH ('\\').
  

Download

• lib/rmdir.c

• /* Work around rmdir bugs.
  
     Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2011 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 3 of the License, 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, see <http://www.gnu.org/licenses/>.  */
  
  #include <config.h>
  
  #include <unistd.h>
  
  #include <errno.h>
  #include <string.h>
  
  #include "dosname.h"
  
  #undef rmdir
  
  /* Remove directory DIR.
     Return 0 if successful, -1 if not.  */
  
  int
  rpl_rmdir (char const *dir)
  {
    /* Work around cygwin 1.5.x bug where rmdir("dir/./") succeeds.  */
    size_t len = strlen (dir);
    int result;
    while (len && ISSLASH (dir[len - 1]))
      len--;
    if (len && dir[len - 1] == '.' && (1 == len || ISSLASH (dir[len - 2])))
      {
        errno = EINVAL;
        return -1;
      }
    result = rmdir (dir);
    /* Work around mingw bug, where rmdir("file/") fails with EINVAL
       instead of ENOTDIR.  We've already filtered out trailing ., the
       only reason allowed by POSIX for EINVAL.  */
    if (result == -1 && errno == EINVAL)
      errno = ENOTDIR;
    return result;
  }
  

Download