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
This commit is contained in:
parent
41f05c8281
commit
29c4b7861b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=250667
@ -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");
|
||||
|
@ -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");
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user