binutils-gdb/gdb/common/filestuff.h
Sergio Durigan Junior 3c025cfe5e Move 'is_regular_file' from common-utils.c to filestuff.c
There is no reason for 'is_regular_file' to be in common-utils.c; it
belongs to 'filestuff.c'.  This commit moves the function definition
and its prototype to the appropriate files.

The motivation behind this move is a failure that happens on certain
cross-compilation environments when compiling the IPA library, due to
the way gnulib probes the need for a 'stat' call replacement.  Because
configure checks when cross-compiling are more limited, gnulib decides
that it needs to substitute the 'stat' calls its own 'rpl_stat';
however, the IPA library doesn't link with gnulib, which leads to an
error when compiling 'common-utils.c':

  ...
  /opt/x86-core2--musl--bleeding-edge-2018.09-1/bin/i686-buildroot-linux-musl-g++  -shared -fPIC -Wl,--soname=libinproctrace.so -Wl,--no-undefined -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os      -I. -I. -I./../common -I./../regformats -I./.. -I./../../include -I./../gnulib/import -Ibuild-gnulib-gdbserver/import -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wpointer-arith -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts -Wempty-body -Wunused-but-set-parameter -Wunused-but-set-variable -Wno-sign-compare -Wno-narrowing -Wno-error=maybe-uninitialized  -DGDBSERVER \
   -Wl,--dynamic-list=./proc-service.list -o libinproctrace.so ax-ipa.o common-utils-ipa.o errors-ipa.o format-ipa.o print-utils-ipa.o regcache-ipa.o remote-utils-ipa.o rsp-low-ipa.o tdesc-ipa.o tracepoint-ipa.o utils-ipa.o vec-ipa.o linux-i386-ipa.o linux-x86-tdesc-ipa.o arch/i386-ipa.o -ldl -pthread
  /opt/x86-core2--musl--bleeding-edge-2018.09-1/lib/gcc/i686-buildroot-linux-musl/8.2.0/../../../../i686-buildroot-linux-musl/bin/ld: common-utils-ipa.o: in function `is_regular_file(char const*, int*)':
  common-utils.c:(.text+0x695): undefined reference to `rpl_stat'
  collect2: error: ld returned 1 exit status
  Makefile:413: recipe for target 'libinproctrace.so' failed
  make[1]: *** [libinproctrace.so] Error 1
  ...

More details can also be found at:

  https://sourceware.org/ml/gdb-patches/2018-09/msg00304.html

The most simple fix for this problem is to move 'is_regular_file' to
'filestuff.c', which is not used by IPA.  This ends up making the
files more logically organized as well, since 'is_regular_file' is a
file operation.

No regressions found.

gdb/ChangeLog:
2018-09-12  Sergio Durigan Junior  <sergiodj@redhat.com>

	* common/common-utils.c: Don't include '<sys/stat.h>'.
	(is_regular_file): Move to...
	* common/filestuff.c (is_regular_file): ... here.
	* common/common-utils.h (is_regular_file): Move to...
	* common/filestuff.h (is_regular_file): ... here.
2018-09-12 13:58:30 -04:00

126 lines
3.6 KiB
C++

/* Low-level file-handling.
Copyright (C) 2012-2018 Free Software Foundation, Inc.
This file is part of GDB.
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/>. */
#ifndef FILESTUFF_H
#define FILESTUFF_H
#include <dirent.h>
/* Note all the file descriptors which are open when this is called.
These file descriptors will not be closed by close_most_fds. */
extern void notice_open_fds (void);
/* Mark a file descriptor as inheritable across an exec. */
extern void mark_fd_no_cloexec (int fd);
/* Mark a file descriptor as no longer being inheritable across an
exec. This is only meaningful when FD was previously passed to
mark_fd_no_cloexec. */
extern void unmark_fd_no_cloexec (int fd);
/* Close all open file descriptors other than those marked by
'notice_open_fds', and stdin, stdout, and stderr. Errors that
occur while closing are ignored. */
extern void close_most_fds (void);
/* Like 'open', but ensures that the returned file descriptor has the
close-on-exec flag set. */
extern int gdb_open_cloexec (const char *filename, int flags,
/* mode_t */ unsigned long mode);
/* Convenience wrapper for the above, which takes the filename as an
std::string. */
static inline int
gdb_open_cloexec (const std::string &filename, int flags,
/* mode_t */ unsigned long mode)
{
return gdb_open_cloexec (filename.c_str (), flags, mode);
}
struct gdb_file_deleter
{
void operator() (FILE *file) const
{
fclose (file);
}
};
/* A unique pointer to a FILE. */
typedef std::unique_ptr<FILE, gdb_file_deleter> gdb_file_up;
/* Like 'fopen', but ensures that the returned file descriptor has the
close-on-exec flag set. */
extern gdb_file_up gdb_fopen_cloexec (const char *filename,
const char *opentype);
/* Convenience wrapper for the above, which takes the filename as an
std::string. */
static inline gdb_file_up
gdb_fopen_cloexec (const std::string &filename, const char *opentype)
{
return gdb_fopen_cloexec (filename.c_str (), opentype);
}
/* Like 'socketpair', but ensures that the returned file descriptors
have the close-on-exec flag set. */
extern int gdb_socketpair_cloexec (int domain, int style, int protocol,
int filedes[2]);
/* Like 'socket', but ensures that the returned file descriptor has
the close-on-exec flag set. */
extern int gdb_socket_cloexec (int domain, int style, int protocol);
/* Like 'pipe', but ensures that the returned file descriptors have
the close-on-exec flag set. */
extern int gdb_pipe_cloexec (int filedes[2]);
/* Return a new cleanup that closes FD. */
extern struct cleanup *make_cleanup_close (int fd);
struct gdb_dir_deleter
{
void operator() (DIR *dir) const
{
closedir (dir);
}
};
/* A unique pointer to a DIR. */
typedef std::unique_ptr<DIR, gdb_dir_deleter> gdb_dir_up;
/* Return true if the file NAME exists and is a regular file.
If the result is false then *ERRNO_PTR is set to a useful value assuming
we're expecting a regular file. */
extern bool is_regular_file (const char *name, int *errno_ptr);
#endif /* FILESTUFF_H */