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

tweaks: drop an unneeded parameter from open_file()

Browse Source 
The 'quiet' parameter is only used when opening a help-text tempfile
or a spell-checked tempfile, and these files necessarily exist, so
'quiet' will never be checked for them.  But in the weird case that
the help-text tempfile could not be opened, it is not a problem that
"New File" gets printed to the status bar because nano will crash
shortly afterwards.  And when the spell-checked tempfile could not
be opened, a "Not Found" message is appropriate, but nano will crash
in this case too.
This commit is contained in:
Benno Schulenberg
2019-05-24 12:42:48 +02:00
parent 137c4467ef
commit b512e253b6
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/files.c
View File

@@ -464,7 +464,7 @@ bool open_buffer(const char *filename, bool new_buffer)
/* If the filename isn't blank, and we are not in NOREAD_MODE, /* If the filename isn't blank, and we are not in NOREAD_MODE,
* open the file. Otherwise, treat it as a new file. */ * open the file. Otherwise, treat it as a new file. */
rc = (filename[0] != '\0' && !ISSET(NOREAD_MODE)) ? rc = (filename[0] != '\0' && !ISSET(NOREAD_MODE)) ?
open_file(realname, new_buffer, inhelp, &f) : -2; open_file(realname, new_buffer, &f) : -2;
/* If we have a non-new file, read it in. Then, if the buffer has /* If we have a non-new file, read it in. Then, if the buffer has
* no stat, update the stat, if applicable. */ * no stat, update the stat, if applicable. */
@@ -504,7 +504,7 @@ void replace_buffer(const char *filename, undo_type action, bool marked)
int descriptor; int descriptor;
FILE *f; FILE *f;
descriptor = open_file(filename, FALSE, TRUE, &f); descriptor = open_file(filename, FALSE, &f);
if (descriptor < 0) if (descriptor < 0)
return; return;
@@ -897,7 +897,7 @@ RETSIGTYPE noop(int signal)
* "New File" if newfie is TRUE, and say "File not found" otherwise. * "New File" if newfie is TRUE, and say "File not found" otherwise.
* Return -2 if we say "New File", -1 if the file isn't opened, and the * Return -2 if we say "New File", -1 if the file isn't opened, and the
* obtained fd otherwise. *f is set to the opened file. */ * obtained fd otherwise. *f is set to the opened file. */
int open_file(const char *filename, bool newfie, bool quiet, FILE **f) int open_file(const char *filename, bool newfie, FILE **f)
{ {
struct stat fileinfo, fileinfo2; struct stat fileinfo, fileinfo2;
struct sigaction oldaction, newaction; struct sigaction oldaction, newaction;
@@ -912,7 +912,6 @@ int open_file(const char *filename, bool newfie, bool quiet, FILE **f)
if (stat(full_filename, &fileinfo) == -1) { if (stat(full_filename, &fileinfo) == -1) {
if (newfie) { if (newfie) {
if (!quiet)
statusbar(_("New File")); statusbar(_("New File"));
free(full_filename); free(full_filename);
return -2; return -2;

2
src/proto.h
View File

@@ -277,7 +277,7 @@ void switch_to_next_buffer(void);
bool close_buffer(void); bool close_buffer(void);
#endif #endif
void read_file(FILE *f, int fd, const char *filename, bool undoable); void read_file(FILE *f, int fd, const char *filename, bool undoable);
int open_file(const char *filename, bool newfie, bool quiet, FILE **f); int open_file(const char *filename, bool newfie, FILE **f);
char *get_next_filename(const char *name, const char *suffix); char *get_next_filename(const char *name, const char *suffix);
void do_insertfile_void(void); void do_insertfile_void(void);
char *get_full_path(const char *origpath); char *get_full_path(const char *origpath);