yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gdbsupport: move gdb_file_up to its own file

Browse Source 
The following patches wants to change gdb_fopen_cloexec and
gdb_mkostemp_cloexec to return a scoped_fd.  Doing this causes a cyclic
include between scoped_fd.h and filestuff.h, that both want to include
each other.  scoped_fd.h includes filestuff.h because of the
scoped_fd::to_file method's return value.  filestuff.h would then
include scoped_fd.h for gdb_fopen_cloexec's and gdb_mkostemp_cloexec's
return values.

To fix that, move gdb_file_up to its own file, gdb_file.h.

Change-Id: Ic82a48914b2aacee8f14af535b7469245f88b93d
This commit is contained in:
Simon Marchi 2021-07-22 11:34:57 -04:00
parent 5109a7bd9b
commit e6e51c9c4b
3 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gdbsupport/filestuff.h
View File

@ -21,6 +21,7 @@
#include <dirent.h>
#include <fcntl.h>
#include "gdb_file.h"
/* Note all the file descriptors which are open when this is called.
These file descriptors will not be closed by close_most_fds. */
@ -69,18 +70,6 @@ gdb_open_cloexec (const std::string &filename, int flags,
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. */

37
gdbsupport/gdb_file.h Normal file
View File

@ -0,0 +1,37 @@
/* gdb_file_up, an RAII wrapper around FILE.
Copyright (C) 2021 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 GDBSUPPORT_GDB_FILE
#define GDBSUPPORT_GDB_FILE
#include <memory>
#include <stdio.h>
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;
#endif

2
gdbsupport/scoped_fd.h
View File

@ -21,7 +21,7 @@
#define COMMON_SCOPED_FD_H
#include <unistd.h>
#include "filestuff.h"
#include "gdb_file.h"
/* A smart-pointer-like class to automatically close a file descriptor. */