ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: reshuffle some declarations and trim a few comments

master
Benno Schulenberg 2017-08-15 14:00:52 +02:00
parent de57d8b722
commit 252dc138a2
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/files.c
View File

@ -1603,11 +1603,10 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
if (ISSET(BACKUP_FILE) && !tmp && realexists && openfile->current_stat && if (ISSET(BACKUP_FILE) && !tmp && realexists && openfile->current_stat &&
(method != OVERWRITE || openfile->mark_set || (method != OVERWRITE || openfile->mark_set ||
openfile->current_stat->st_mtime == st.st_mtime)) { openfile->current_stat->st_mtime == st.st_mtime)) {
int backup_fd;
FILE *backup_file = NULL;
char *backupname;
static struct timespec filetime[2]; static struct timespec filetime[2];
int backup_cflags; char *backupname;
int backup_cflags, backup_fd;
FILE *backup_file = NULL;
/* Save the original file's access and modification times. */ /* Save the original file's access and modification times. */
filetime[0].tv_sec = openfile->current_stat->st_atime; filetime[0].tv_sec = openfile->current_stat->st_atime;
@ -1621,7 +1620,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
statusline(ALERT, _("Error reading %s: %s"), realname, statusline(ALERT, _("Error reading %s: %s"), realname,
strerror(errno)); strerror(errno));
/* If we can't read from the original file, go on, since /* If we can't read from the original file, go on, since
* only saving the original file is better than saving * only saving the current buffer is better than saving
* nothing. */ * nothing. */
goto skip_backup; goto skip_backup;
} }
@ -1635,13 +1634,10 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
if (backup_dir != NULL) { if (backup_dir != NULL) {
char *backuptemp = get_full_path(realname); char *backuptemp = get_full_path(realname);
/* If we can't get a canonical absolute path, just use the
* filename portion of the given path. Otherwise, replace
* slashes with exclamation marks in the full path. */
if (backuptemp == NULL) if (backuptemp == NULL)
/* If get_full_path() failed, we don't have a
* canonicalized absolute pathname, so just use the
* filename portion of the pathname. We use tail() so
* that e.g. ../backupname will be backed up in
* backupdir/backupname~ instead of
* backupdir/../backupname~. */
backuptemp = mallocstrcpy(NULL, tail(realname)); backuptemp = mallocstrcpy(NULL, tail(realname));
else { else {
size_t i = 0; size_t i = 0;
@ -1662,10 +1658,9 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
free(backuptemp); free(backuptemp);
free(backupname); free(backupname);
/* If we can't write to the backup, DON'T go on, since /* If we can't write to the backup, DON'T go on, since
* whatever caused the backup file to fail (e.g. disk * whatever caused the backup-file write to fail (e.g.
* full may well cause the real file write to fail, * disk full) may well cause the real file write to fail
* which means we could lose both the backup and the * too, which means we could lose the original! */
* original! */
goto cleanup_and_exit; goto cleanup_and_exit;
} else { } else {
free(backupname); free(backupname);
@ -1703,10 +1698,6 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
statusline(HUSH, _("Error writing backup file %s: %s"), statusline(HUSH, _("Error writing backup file %s: %s"),
backupname, strerror(errno)); backupname, strerror(errno));
free(backupname); free(backupname);
/* If we can't make a backup, DON'T go on, since whatever caused
* the backup to fail (e.g. disk full) may well cause the real
* file write to fail, in which case we could lose both the
* backup and the original! */
goto cleanup_and_exit; goto cleanup_and_exit;
} }
@ -1768,8 +1759,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
if (f_open == NULL) { if (f_open == NULL) {
original_umask = umask(0); original_umask = umask(0);
/* If we create a temp file, we don't let anyone else access it. /* If we create a temp file, we don't let anyone else access it. */
* We create a temp file if tmp is TRUE. */
if (tmp) if (tmp)
umask(S_IRWXG | S_IRWXO); umask(S_IRWXG | S_IRWXO);
else else