Mercurial > octave

comparison liboctave/lo-sysdep.cc @ 3069:db6d57d718f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1997-07-10 23:34:03 by jwe]
author jwe
date Thu, 10 Jul 1997 23:34:07 +0000
parents 66ef74ee5d9f
children 92394a9e4784
comparison
equal deleted inserted replaced
3068:17e2f90e0d3b 3069:db6d57d718f7
45 45
46 #if ! defined (HAVE_GETHOSTNAME) && defined (HAVE_SYS_UTSNAME_H) 46 #if ! defined (HAVE_GETHOSTNAME) && defined (HAVE_SYS_UTSNAME_H)
47 #include <sys/utsname.h> 47 #include <sys/utsname.h>
48 #endif 48 #endif
49 49
50 #include "lo-error.h"
50 #include "pathlen.h" 51 #include "pathlen.h"
51 52
52 string 53 string
53 octave_getcwd (void) 54 octave_getcwd (void)
54 { 55 {
55 string retval; 56 string retval;
57
56 char buf[MAXPATHLEN]; 58 char buf[MAXPATHLEN];
57 59
60 char *tmp = 0;
61
58 #if defined (__EMX__) 62 #if defined (__EMX__)
59 char *tmp = _getcwd2 (buf, MAXPATHLEN); 63 tmp = _getcwd2 (buf, MAXPATHLEN);
60 #else 64 #elif defined (HAVE_GETWD)
61 char *tmp = getcwd (buf, MAXPATHLEN); 65 tmp = getwd (buf);
66 #elif defined (HAVE_GETCWD)
67 tmp = getcwd (buf, MAXPATHLEN);
62 #endif 68 #endif
63 69
64 if (tmp) 70 if (tmp)
65 retval = tmp; 71 retval = tmp;
72 else
73 (*current_liboctave_error_handler) ("unable to find current directory");
66 74
67 return retval; 75 return retval;
68 } 76 }
69 77
70 int 78 int