Author: ngie
Date: Tue Oct 27 07:23:40 2015
New Revision: 290041
URL: https://svnweb.freebsd.org/changeset/base/290041
Log:
MFC r250667:
r250667 (by jh):
Rename O_DIRECTORY to O_TMP_DIRECTORY to avoid shadowing the fcntl.h
O_DIRECTORY flag.
PR: bin/173924
Obtained from: git://repo.or.cz/nvi.git
Modified:
stable/9/contrib/nvi/common/exf.c
stable/9/contrib/nvi/common/options.c
stable/9/contrib/nvi/include/options_def.h
Directory Properties:
stable/9/ (props changed)
stable/9/contrib/ (props changed)
stable/9/contrib/nvi/ (props changed)
Modified: stable/9/contrib/nvi/common/exf.c
==============================================================================
--- stable/9/contrib/nvi/common/exf.c Tue Oct 27 07:08:47 2015
(r290040)
+++ stable/9/contrib/nvi/common/exf.c Tue Oct 27 07:23:40 2015
(r290041)
@@ -187,10 +187,10 @@ file_init(sp, frp, rcv_name, flags)
*/
oname = frp->name;
if (LF_ISSET(FS_OPENERR) || oname == NULL || !exists) {
- if (opts_empty(sp, O_DIRECTORY, 0))
+ if (opts_empty(sp, O_TMP_DIRECTORY, 0))
goto err;
(void)snprintf(tname, sizeof(tname),
- "%s/vi.XXXXXXXXXX", O_STR(sp, O_DIRECTORY));
+ "%s/vi.XXXXXXXXXX", O_STR(sp, O_TMP_DIRECTORY));
if ((fd = mkstemp(tname)) == -1) {
msgq(sp, M_SYSERR,
"237|Unable to create temporary file");
Modified: stable/9/contrib/nvi/common/options.c
==============================================================================
--- stable/9/contrib/nvi/common/options.c Tue Oct 27 07:08:47 2015
(r290040)
+++ stable/9/contrib/nvi/common/options.c Tue Oct 27 07:23:40 2015
(r290041)
@@ -64,7 +64,7 @@ OPTLIST const optlist[] = {
{"columns", f_columns, OPT_NUM, OPT_NOSAVE},
/* O_COMMENT 4.4BSD */
{"comment", NULL, OPT_0BOOL, 0},
-/* O_DIRECTORY 4BSD */
+/* O_TMP_DIRECTORY 4BSD */
{"directory", NULL, OPT_STR, 0},
/* O_EDCOMPATIBLE 4BSD */
{"edcompatible",NULL, OPT_0BOOL, 0},
@@ -244,7 +244,7 @@ static OABBREV const abbrev[] = {
{"aw", O_AUTOWRITE}, /* 4BSD */
{"bf", O_BEAUTIFY}, /* 4BSD */
{"co", O_COLUMNS}, /* 4.4BSD */
- {"dir", O_DIRECTORY}, /* 4BSD */
+ {"dir", O_TMP_DIRECTORY}, /* 4BSD */
{"eb", O_ERRORBELLS}, /* 4BSD */
{"ed", O_EDCOMPATIBLE}, /* 4BSD */
{"ex", O_EXRC}, /* System V (undocumented) */
@@ -347,7 +347,7 @@ opts_init(sp, oargs)
*/
(void)snprintf(b1, sizeof(b1),
"directory=%s", (s = getenv("TMPDIR")) == NULL ? _PATH_TMP : s);
- OI(O_DIRECTORY, b1);
+ OI(O_TMP_DIRECTORY, b1);
OI(O_ESCAPETIME, "escapetime=6");
OI(O_KEYTIME, "keytime=6");
OI(O_MATCHTIME, "matchtime=7");
Modified: stable/9/contrib/nvi/include/options_def.h
==============================================================================
--- stable/9/contrib/nvi/include/options_def.h Tue Oct 27 07:08:47 2015
(r290040)
+++ stable/9/contrib/nvi/include/options_def.h Tue Oct 27 07:23:40 2015
(r290041)
@@ -8,7 +8,7 @@
#define O_CEDIT 7
#define O_COLUMNS 8
#define O_COMMENT 9
-#define O_DIRECTORY 10
+#define O_TMP_DIRECTORY 10
#define O_EDCOMPATIBLE 11
#define O_ESCAPETIME 12
#define O_ERRORBELLS 13
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
