Mercurial > cpython-lru_cache-weakref
diff Python/getcwd.c @ 61463:fd25030223b0 legacy-trunk
Untabify C files. Will watch buildbots.
| author | Antoine Pitrou <solipsis@pitrou.net> |
|---|---|
| date | Sun, 09 May 2010 14:46:46 +0000 |
| parents | 6fb6fa802221 |
| children | b36cb4602e21 |
line wrap: on
line diff
--- a/Python/getcwd.c Sun May 09 14:04:59 2010 +0000 +++ b/Python/getcwd.c Sun May 09 14:46:46 2010 +0000 @@ -26,24 +26,24 @@ char * getcwd(char *buf, int size) { - char localbuf[MAXPATHLEN+1]; - char *ret; + char localbuf[MAXPATHLEN+1]; + char *ret; - if (size <= 0) { - errno = EINVAL; - return NULL; - } - ret = getwd(localbuf); - if (ret != NULL && strlen(localbuf) >= (size_t)size) { - errno = ERANGE; - return NULL; - } - if (ret == NULL) { - errno = EACCES; /* Most likely error */ - return NULL; - } - strncpy(buf, localbuf, size); - return buf; + if (size <= 0) { + errno = EINVAL; + return NULL; + } + ret = getwd(localbuf); + if (ret != NULL && strlen(localbuf) >= (size_t)size) { + errno = ERANGE; + return NULL; + } + if (ret == NULL) { + errno = EACCES; /* Most likely error */ + return NULL; + } + strncpy(buf, localbuf, size); + return buf; } #else /* !HAVE_GETWD */ @@ -57,26 +57,26 @@ char * getcwd(char *buf, int size) { - FILE *fp; - char *p; - if (size <= 0) { - errno = EINVAL; - return NULL; - } - if ((fp = popen(PWD_CMD, "r")) == NULL) - return NULL; - if (fgets(buf, size, fp) == NULL || pclose(fp) != 0) { - errno = EACCES; /* Most likely error */ - return NULL; - } - for (p = buf; *p != '\n'; p++) { - if (*p == '\0') { - errno = ERANGE; - return NULL; - } - } - *p = '\0'; - return buf; + FILE *fp; + char *p; + if (size <= 0) { + errno = EINVAL; + return NULL; + } + if ((fp = popen(PWD_CMD, "r")) == NULL) + return NULL; + if (fgets(buf, size, fp) == NULL || pclose(fp) != 0) { + errno = EACCES; /* Most likely error */ + return NULL; + } + for (p = buf; *p != '\n'; p++) { + if (*p == '\0') { + errno = ERANGE; + return NULL; + } + } + *p = '\0'; + return buf; } #endif /* !HAVE_GETWD */
