Merged revisions 191283 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r191283 | tilghman | 2009-04-30 01:47:13 -0500 (Thu, 30 Apr 2009) | 11 lines
  
  Change working directory to / under certain conditions.
  If backgrounding and no core will be produced, then changing the directory
  won't break anything; likewise, if the CWD isn't accessible by the current
  user, then a core wasn't possible anyway.
  (closes issue #14831)
   Reported by: chris-mac
   Patches: 
         20090428__bug14831.diff.txt uploaded by tilghman (license 14)
         20090430__bug14831.diff.txt uploaded by tilghman (license 14)
   Tested by: chris-mac
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@191285 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-04-30 06:48:50 +00:00
parent 88eae5d322
commit 2c77a43e9b

View File

@@ -3279,6 +3279,23 @@ int main(int argc, char *argv[])
ast_log(LOG_WARNING, "Unable to set the process for core dumps after changing to a non-root user. %s\n", strerror(errno)); ast_log(LOG_WARNING, "Unable to set the process for core dumps after changing to a non-root user. %s\n", strerror(errno));
} }
} }
{
char dir[PATH_MAX];
if (!getcwd(dir, sizeof(dir)) || eaccess(dir, R_OK | X_OK | F_OK)) {
ast_log(LOG_ERROR, "Unable to access the running directory (%s). Changing to '/' for compatibility.\n", strerror(errno));
/* If we cannot access the CWD, then we couldn't dump core anyway,
* so chdir("/") won't break anything. */
if (chdir("/")) {
ast_log(LOG_ERROR, "chdir() failed?!! %s\n", strerror(errno));
}
} else if (!ast_opt_no_fork && !ast_opt_dump_core) {
/* Backgrounding, but no cores, so chdir won't break anything. */
if (chdir("/")) {
ast_log(LOG_ERROR, "Unable to chdir(\"/\") ?!! %s\n", strerror(errno));
}
}
}
#endif #endif
ast_term_init(); ast_term_init();