Respect SIMPLE_BACKUP_SUFFIX environment variable in indent(1)
Instead of using a non-configurable ".BAK" suffix, respect the SIMPLE_BACKUP_SUFFIX environment variable also used by patch(1). This simplifies cleanup operations in some patch/indent workflows. Reviewed by: cem (earlier version), emaste, pstef Approved by: emaste (mentor) Differential Revision: https://reviews.freebsd.org/D10921
This commit is contained in:
parent
fe04f5e9d0
commit
c6841b079b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=322177
@ -30,7 +30,7 @@
|
||||
.\" @(#)indent.1 8.1 (Berkeley) 7/1/93
|
||||
.\" $FreeBSD$
|
||||
.\"
|
||||
.Dd July 25, 2017
|
||||
.Dd August 7, 2017
|
||||
.Dt INDENT 1
|
||||
.Os
|
||||
.Sh NAME
|
||||
@ -119,7 +119,10 @@ If
|
||||
is named
|
||||
.Sq Pa /blah/blah/file ,
|
||||
the backup file is named
|
||||
.Sq Pa file.BAK .
|
||||
.Sq Pa file.BAK
|
||||
by default. The extension used for the backup file may be overridden using the
|
||||
.Ev SIMPLE_BACKUP_SUFFIX
|
||||
environment variable.
|
||||
.Pp
|
||||
If
|
||||
.Ar output-file
|
||||
|
@ -71,6 +71,8 @@ const char *in_name = "Standard Input"; /* will always point to name of input
|
||||
* file */
|
||||
const char *out_name = "Standard Output"; /* will always point to name
|
||||
* of output file */
|
||||
const char *simple_backup_suffix = ".BAK"; /* Suffix to use for backup
|
||||
* files */
|
||||
char bakfile[MAXPATHLEN] = "";
|
||||
|
||||
int
|
||||
@ -99,7 +101,7 @@ main(int argc, char **argv)
|
||||
|
||||
int last_else = 0; /* true iff last keyword was an else */
|
||||
const char *profile_name = NULL;
|
||||
|
||||
const char *envval = NULL;
|
||||
|
||||
/*-----------------------------------------------*\
|
||||
| INITIALIZATION |
|
||||
@ -160,6 +162,10 @@ main(int argc, char **argv)
|
||||
output = NULL;
|
||||
tabs_to_var = 0;
|
||||
|
||||
envval = getenv("SIMPLE_BACKUP_SUFFIX");
|
||||
if (envval)
|
||||
simple_backup_suffix = envval;
|
||||
|
||||
/*--------------------------------------------------*\
|
||||
| COMMAND LINE SCAN |
|
||||
\*--------------------------------------------------*/
|
||||
@ -1234,7 +1240,7 @@ bakcopy(void)
|
||||
p--;
|
||||
if (*p == '/')
|
||||
p++;
|
||||
sprintf(bakfile, "%s.BAK", p);
|
||||
sprintf(bakfile, "%s%s", p, simple_backup_suffix);
|
||||
|
||||
/* copy in_name to backup file */
|
||||
bakchn = creat(bakfile, 0600);
|
||||
|
Loading…
Reference in New Issue
Block a user