LineageOS/android_external_nano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

still more breakage fixes

Browse Source 
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2837 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
David Lawrence Ramsey
2005-07-08 21:12:39 +00:00
parent dbcaa3b1fb
commit 76c25f582a
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/files.c
View File

@@ -157,6 +157,8 @@ void open_buffer(const char *filename)
/* rc == -2 means that we have a new file. -1 means that the
* open() failed. 0 means that the open() succeeded. */
assert(filename != NULL);
#ifndef DISABLE_OPERATINGDIR
if (check_operating_dir(filename, FALSE)) {
statusbar(_("Can't insert file from outside of %s"),
@@ -165,8 +167,9 @@ void open_buffer(const char *filename)
}
#endif
/* Open the file. */
rc = open_file(filename, new_buffer, &f);
/* If the filename isn't blank, open the file. */
if (filename[0] != '\0')
rc = open_file(filename, new_buffer, &f);
/* If we're loading into a new buffer, add a new openfile entry. */
if (new_buffer)
@@ -534,10 +537,9 @@ int open_file(const char *filename, bool newfie, FILE **f)
int fd;
struct stat fileinfo;
assert(f != NULL);
assert(filename != NULL && f != NULL);
if (filename == NULL || filename[0] == '\0' ||
stat(filename, &fileinfo) == -1) {
if (stat(filename, &fileinfo) == -1) {
if (newfie) {
statusbar(_("New File"));
return -2;