projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
638df7b
)
Removed calls to chdir() from citserver. Not needed, and we are trying to make the...
author
Art Cancro
<ajc@citadel.org>
Sat, 2 Jan 2021 00:59:29 +0000
(19:59 -0500)
committer
Art Cancro
<ajc@citadel.org>
Sat, 2 Jan 2021 00:59:29 +0000
(19:59 -0500)
citadel/config.c
patch
|
blob
|
history
citadel/sysdep.c
patch
|
blob
|
history
diff --git
a/citadel/config.c
b/citadel/config.c
index 3e9ac8b07f68a59f18b3fda2bf9286a194a888b7..81f93989b2120dbc3d571961d1fe79eb37f8f62d 100644
(file)
--- a/
citadel/config.c
+++ b/
citadel/config.c
@@
-1,7
+1,7
@@
/*
* Read and write the citadel.config file
*
/*
* Read and write the citadel.config file
*
- * Copyright (c) 1987-202
0
by the citadel.org team
+ * Copyright (c) 1987-202
1
by the citadel.org team
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
@@
-232,14
+232,14
@@
void initialize_config_system(void) {
exit(CTDLEXIT_LIBCITADEL);
}
exit(CTDLEXIT_LIBCITADEL);
}
- if (chdir(ctdl_bbsbase_dir) != 0) {
- fprintf(stderr,
- "This program could not be started.\nUnable to change directory to %s\nError: %s\n",
- ctdl_bbsbase_dir,
- strerror(errno)
- );
- exit(CTDLEXIT_HOME);
- }
+
//
if (chdir(ctdl_bbsbase_dir) != 0) {
+
//
fprintf(stderr,
+
//
"This program could not be started.\nUnable to change directory to %s\nError: %s\n",
+
//
ctdl_bbsbase_dir,
+
//
strerror(errno)
+
//
);
+
//
exit(CTDLEXIT_HOME);
+
//
}
memset(&lconfig, 0, sizeof(struct legacy_config));
cfp = fopen(file_citadel_config, "rb");
memset(&lconfig, 0, sizeof(struct legacy_config));
cfp = fopen(file_citadel_config, "rb");
diff --git
a/citadel/sysdep.c
b/citadel/sysdep.c
index 9b1bcfa56b6ad21d430458c937ddcb825df4b32b..fe8afed300531ccc99b2002579f49f0110b0811e 100644
(file)
--- a/
citadel/sysdep.c
+++ b/
citadel/sysdep.c
@@
-4,7
+4,7
@@
* Here's where we (hopefully) have most parts of the Citadel server that
* might need tweaking when run on different operating system variants.
*
* Here's where we (hopefully) have most parts of the Citadel server that
* might need tweaking when run on different operating system variants.
*
- * Copyright (c) 1987-20
19
by the citadel.org team
+ * Copyright (c) 1987-20
21
by the citadel.org team
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License, version 3.
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License, version 3.
@@
-946,17
+946,16
@@
void start_daemon(int unused) {
pid_t child = 0;
FILE *fp;
int do_restart = 0;
pid_t child = 0;
FILE *fp;
int do_restart = 0;
-
current_child = 0;
current_child = 0;
+ //if (chdir(ctdl_run_dir) != 0) {
+ //syslog(LOG_ERR, "%s: %m", ctdl_run_dir);
+ //}
+
/* Close stdin/stdout/stderr and replace them with /dev/null.
* We don't just call close() because we don't want these fd's
* to be reused for other files.
*/
/* Close stdin/stdout/stderr and replace them with /dev/null.
* We don't just call close() because we don't want these fd's
* to be reused for other files.
*/
- if (chdir(ctdl_run_dir) != 0) {
- syslog(LOG_ERR, "%s: %m", ctdl_run_dir);
- }
-
child = fork();
if (child != 0) {
exit(0);
child = fork();
if (child != 0) {
exit(0);