mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
73cc72729a
This patch moves the gdb/gnulib subdirectory to the top level. It adjusts the top-level build system to build gnulib when necessary, and changes gdb to use this. However, gdbserver still builds its own copy of gnulib, just from the new source location. A small hack was needed to ensure that gnulib is only built when gdb is enabled. The Makefile only provides an ordering -- the directory must be mentioned in configdirs to actually be compiled at all. Most of the patch is just a "git mv" of gnulib, though a few minor path adjustments were needed in some files there. Tested by the buildbot. ChangeLog 2019-06-14 Tom Tromey <tom@tromey.com> * MAINTAINERS: Add gnulib. * gnulib: New directory, move from gdb/gnulib. * configure.ac (host_libs): Add gnulib. * configure: Rebuild. * Makefile.def (host_modules, dependencies): Add gnulib. * Makefile.in: Rebuild. gdb/ChangeLog 2019-06-14 Tom Tromey <tom@tromey.com> * gnulib: Move directory to top-level. * configure.ac: Don't configure gnulib. * configure: Rebuild. * common/common-defs.h: Use new path to gnulib. * Makefile.in (GNULIB_BUILDDIR): Now ../gnulib. (GNULIB_H): Remove. (INCGNU): Look in new gnulib location. (HFILES_NO_SRCDIR): Remove gnulib files. (SUBDIR, REQUIRED_SUBDIRS): Remove gnulib. (generated_files): Remove GNULIB_H. ($(LIBGNU), all-lib): Remove targets. (distclean): Don't mention GNULIB_BUILDDIR. ($(GNULIB_BUILDDIR)/Makefile): Remove target. gdb/gdbserver/ChangeLog 2019-06-14 Tom Tromey <tom@tromey.com> * configure.ac: Use new path to gnulib. * configure: Rebuild. * Makefile.in (INCGNU, $(GNULIB_BUILDDIR)/Makefile): Use new path to gnulib. gnulib/ChangeLog 2019-06-14 Tom Tromey <tom@tromey.com> * update-gnulib.sh: Adjust paths. * Makefile.in: Adjust paths. * configure.ac: Adjust paths. Use ACX_LARGEFILE. * configure: Rebuild.
87 lines
3.1 KiB
C
87 lines
3.1 KiB
C
/* dirname.c -- return all but the last element in a file name
|
|
|
|
Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2016 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 "dirname.h"
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
/* Return the length of the prefix of FILE that will be used by
|
|
dir_name. If FILE is in the working directory, this returns zero
|
|
even though 'dir_name (FILE)' will return ".". Works properly even
|
|
if there are trailing slashes (by effectively ignoring them). */
|
|
|
|
size_t
|
|
dir_len (char const *file)
|
|
{
|
|
size_t prefix_length = FILE_SYSTEM_PREFIX_LEN (file);
|
|
size_t length;
|
|
|
|
/* Advance prefix_length beyond important leading slashes. */
|
|
prefix_length += (prefix_length != 0
|
|
? (FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE
|
|
&& ISSLASH (file[prefix_length]))
|
|
: (ISSLASH (file[0])
|
|
? ((DOUBLE_SLASH_IS_DISTINCT_ROOT
|
|
&& ISSLASH (file[1]) && ! ISSLASH (file[2])
|
|
? 2 : 1))
|
|
: 0));
|
|
|
|
/* Strip the basename and any redundant slashes before it. */
|
|
for (length = last_component (file) - file;
|
|
prefix_length < length; length--)
|
|
if (! ISSLASH (file[length - 1]))
|
|
break;
|
|
return length;
|
|
}
|
|
|
|
|
|
/* In general, we can't use the builtin 'dirname' function if available,
|
|
since it has different meanings in different environments.
|
|
In some environments the builtin 'dirname' modifies its argument.
|
|
|
|
Return the leading directories part of FILE, allocated with malloc.
|
|
Works properly even if there are trailing slashes (by effectively
|
|
ignoring them). Return NULL on failure.
|
|
|
|
If lstat (FILE) would succeed, then { chdir (dir_name (FILE));
|
|
lstat (base_name (FILE)); } will access the same file. Likewise,
|
|
if the sequence { chdir (dir_name (FILE));
|
|
rename (base_name (FILE), "foo"); } succeeds, you have renamed FILE
|
|
to "foo" in the same directory FILE was in. */
|
|
|
|
char *
|
|
mdir_name (char const *file)
|
|
{
|
|
size_t length = dir_len (file);
|
|
bool append_dot = (length == 0
|
|
|| (FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE
|
|
&& length == FILE_SYSTEM_PREFIX_LEN (file)
|
|
&& file[2] != '\0' && ! ISSLASH (file[2])));
|
|
char *dir = malloc (length + append_dot + 1);
|
|
if (!dir)
|
|
return NULL;
|
|
memcpy (dir, file, length);
|
|
if (append_dot)
|
|
dir[length++] = '.';
|
|
dir[length] = '\0';
|
|
return dir;
|
|
}
|