Date: Wed, 15 May 2013 18:41:49 +0000 (UTC) From: Jaakko Heinonen <jh@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r250667 - in head/contrib/nvi: common include Message-ID: <201305151841.r4FIfnTZ051892@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jh Date: Wed May 15 18:41:49 2013 New Revision: 250667 URL: http://svnweb.freebsd.org/changeset/base/250667 Log: 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: head/contrib/nvi/common/exf.c head/contrib/nvi/common/options.c head/contrib/nvi/include/options_def.h Modified: head/contrib/nvi/common/exf.c ============================================================================== --- head/contrib/nvi/common/exf.c Wed May 15 18:38:28 2013 (r250666) +++ head/contrib/nvi/common/exf.c Wed May 15 18:41:49 2013 (r250667) @@ -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: head/contrib/nvi/common/options.c ============================================================================== --- head/contrib/nvi/common/options.c Wed May 15 18:38:28 2013 (r250666) +++ head/contrib/nvi/common/options.c Wed May 15 18:41:49 2013 (r250667) @@ -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: head/contrib/nvi/include/options_def.h ============================================================================== --- head/contrib/nvi/include/options_def.h Wed May 15 18:38:28 2013 (r250666) +++ head/contrib/nvi/include/options_def.h Wed May 15 18:41:49 2013 (r250667) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305151841.r4FIfnTZ051892>