[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] Changes to ccvs/src/main.c
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] Changes to ccvs/src/main.c |
Date: |
Sun, 25 Sep 2005 20:23:48 -0400 |
Index: ccvs/src/main.c
diff -u ccvs/src/main.c:1.255 ccvs/src/main.c:1.256
--- ccvs/src/main.c:1.255 Tue Sep 20 17:35:08 2005
+++ ccvs/src/main.c Mon Sep 26 00:23:44 2005
@@ -70,8 +70,6 @@
/* Temp dir, if set by the user. */
static char *tmpdir_cmdline;
-/* Temp dir, if set in the environment. */
-static const char *tmpdir_env;
@@ -92,8 +90,8 @@
const char *retval;
if (tmpdir_cmdline) retval = tmpdir_cmdline;
else if (config && config->TmpDir) retval = config->TmpDir;
- else if (tmpdir_env) retval = tmpdir_env;
- else retval = TMPDIR_DFLT;
+ else retval = get_system_temp_dir ();
+ if (!retval) retval = TMPDIR_DFLT;
if (!retval || !*retval) error (1, 0, "No temp dir specified.");
@@ -102,16 +100,6 @@
-void
-push_env_tmp_dir (void)
-{
- const char *tmpdir = get_cvs_tmp_dir ();
- if (tmpdir_env && strcmp (tmpdir_env, tmpdir))
- setenv (TMPDIR_ENV, tmpdir, 1);
-}
-
-
-
/* When our working directory contains subdirectories with different
values in CVS/Root files, we maintain a list of them. */
List *root_directories = NULL;
@@ -534,8 +522,6 @@
* Query the environment variables up-front, so that
* they can be overridden by command line arguments
*/
- if ((cp = getenv (TMPDIR_ENV)) != NULL)
- tmpdir_env = cp;
if ((cp = getenv (EDITOR1_ENV)) != NULL)
Editor = cp;
else if ((cp = getenv (EDITOR2_ENV)) != NULL)
- [Cvs-cvs] Changes to ccvs/src/main.c, Larry Jones, 2005/09/02
- [Cvs-cvs] Changes to ccvs/src/main.c, Derek Robert Price, 2005/09/04
- [Cvs-cvs] Changes to ccvs/src/main.c, Derek Robert Price, 2005/09/04
- [Cvs-cvs] Changes to ccvs/src/main.c, Derek Robert Price, 2005/09/05
- [Cvs-cvs] Changes to ccvs/src/main.c, Derek Robert Price, 2005/09/05
- [Cvs-cvs] Changes to ccvs/src/main.c, Derek Robert Price, 2005/09/06
- [Cvs-cvs] Changes to ccvs/src/main.c, Derek Robert Price, 2005/09/11
- [Cvs-cvs] Changes to ccvs/src/main.c, Derek Robert Price, 2005/09/20
- [Cvs-cvs] Changes to ccvs/src/main.c,
Derek Robert Price <=
- [Cvs-cvs] Changes to ccvs/src/main.c, Derek Robert Price, 2005/09/25
- [Cvs-cvs] Changes to ccvs/src/main.c, Mark D . Baushke, 2005/09/28
- [Cvs-cvs] Changes to ccvs/src/main.c, Mark D . Baushke, 2005/09/29
- [Cvs-cvs] Changes to ccvs/src/main.c, Derek Robert Price, 2005/09/29
- [Cvs-cvs] Changes to ccvs/src/main.c, Mark D . Baushke, 2005/09/29
- [Cvs-cvs] Changes to ccvs/src/main.c, Mark D . Baushke, 2005/09/29