Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 18 Jan 2018 21:29:47 +0000 (UTC)
From:      Kyle Evans <kevans@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r328138 - stable/11/usr.bin/indent
Message-ID:  <201801182129.w0ILTl3O006587@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: kevans
Date: Thu Jan 18 21:29:46 2018
New Revision: 328138
URL: https://svnweb.freebsd.org/changeset/base/328138

Log:
  MFC r322177: 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.

Modified:
  stable/11/usr.bin/indent/indent.1
  stable/11/usr.bin/indent/indent.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.bin/indent/indent.1
==============================================================================
--- stable/11/usr.bin/indent/indent.1	Thu Jan 18 21:19:57 2018	(r328137)
+++ stable/11/usr.bin/indent/indent.1	Thu Jan 18 21:29:46 2018	(r328138)
@@ -30,7 +30,7 @@
 .\"	@(#)indent.1	8.1 (Berkeley) 7/1/93
 .\" $FreeBSD$
 .\"
-.Dd March 3, 2012
+.Dd August 7, 2017
 .Dt INDENT 1
 .Os
 .Sh NAME
@@ -113,7 +113,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

Modified: stable/11/usr.bin/indent/indent.c
==============================================================================
--- stable/11/usr.bin/indent/indent.c	Thu Jan 18 21:19:57 2018	(r328137)
+++ stable/11/usr.bin/indent/indent.c	Thu Jan 18 21:29:46 2018	(r328138)
@@ -68,6 +68,8 @@ const char *in_name = "Standard Input";	/* will always
 					 * 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
@@ -94,8 +96,8 @@ main(int argc, char **argv)
     int         type_code;	/* the type of token, returned by lexi */
 
     int         last_else = 0;	/* true iff last keyword was an else */
+    const char *envval = NULL;
 
-
     /*-----------------------------------------------*\
     |		      INITIALIZATION		      |
     \*-----------------------------------------------*/
@@ -154,6 +156,10 @@ main(int argc, char **argv)
     output = 0;
     tabs_to_var = 0;
 
+    envval = getenv("SIMPLE_BACKUP_SUFFIX");
+    if (envval)
+        simple_backup_suffix = envval;
+
     /*--------------------------------------------------*\
     |   		COMMAND LINE SCAN		 |
     \*--------------------------------------------------*/
@@ -1207,7 +1213,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);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801182129.w0ILTl3O006587>