Mercurial > octave-nkf
comparison src/sysdep.cc @ 12308:b6e47a4de018 release-3-4-x
try to get better value than \ for P_tmpdir on Windows systems
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 31 Jan 2011 03:19:01 -0500 |
| parents | 12df7854fa7c |
| children | 7a5aacf65f81 |
comparison
equal
deleted
inserted
replaced
| 12307:3dc4cfc5a3c1 | 12308:b6e47a4de018 |
|---|---|
| 466 | 466 |
| 467 raw_mode (false, true); | 467 raw_mode (false, true); |
| 468 #endif | 468 #endif |
| 469 | 469 |
| 470 return c; | 470 return c; |
| 471 } | |
| 472 | |
| 473 std::string | |
| 474 get_P_tmpdir (void) | |
| 475 { | |
| 476 #if defined (__WIN32__) && ! defined (_POSIX_VERSION) | |
| 477 | |
| 478 std::string retval; | |
| 479 | |
| 480 #if defined (P_tmpdir) | |
| 481 retval = P_tmpdir; | |
| 482 #endif | |
| 483 | |
| 484 // Apparently some versions of MinGW and MSVC either don't define | |
| 485 // P_tmpdir, or they define it to a single backslash, neither of which | |
| 486 // is particularly helpful. | |
| 487 | |
| 488 if (retval.empty () || retval == "\\") | |
| 489 { | |
| 490 retval = octave_env::getenv ("TEMP"); | |
| 491 | |
| 492 if (retval.empty ()) | |
| 493 retval = octave_env::getenv ("TMP"); | |
| 494 | |
| 495 if (retval.empty ()) | |
| 496 retval = "c:\\temp"; | |
| 497 } | |
| 498 | |
| 499 return retval; | |
| 500 | |
| 501 #elif defined (P_tmpdir) | |
| 502 | |
| 503 return P_tmpdir; | |
| 504 | |
| 505 #else | |
| 506 | |
| 507 return "/tmp"; | |
| 508 | |
| 509 #endif | |
| 471 } | 510 } |
| 472 | 511 |
| 473 DEFUN (clc, , , | 512 DEFUN (clc, , , |
| 474 "-*- texinfo -*-\n\ | 513 "-*- texinfo -*-\n\ |
| 475 @deftypefn {Built-in Function} {} clc ()\n\ | 514 @deftypefn {Built-in Function} {} clc ()\n\ |