brian/ratatoskr-messenger
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

defaulting to UTF-8 and doing something with PID files

Browse Source
This commit is contained in:
Brian 2022-07-25 09:11:47 -06:00
parent ee1236fa5c
commit 49322894fa
Signed by: brian
GPG Key ID: DE1A5390A3B84CD8
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/charset.c
View File

@ -60,7 +60,7 @@ ZGetCharset(char *charset)
if (!strcmp(charset, "NONE") || !strcmp(charset, "UNKNOWN")) if (!strcmp(charset, "NONE") || !strcmp(charset, "UNKNOWN"))
retval = ZCHARSET_UNKNOWN; retval = ZCHARSET_UNKNOWN;
else if (!strcmp(charset, "ANSI_X3.4-1968")) else if (!strcmp(charset, "ANSI_X3.4-1968"))
retval = ZCHARSET_ISO_8859_1; /* A hack. */ retval = ZCHARSET_UTF_8; /* A hack. */
else if (!strcmp(charset, "ISO-8859-1")) else if (!strcmp(charset, "ISO-8859-1"))
retval = ZCHARSET_ISO_8859_1; retval = ZCHARSET_ISO_8859_1;
else if (!strcmp(charset, "UTF-8")) else if (!strcmp(charset, "UTF-8"))

15
zhm/zhm.c
View File

@ -412,15 +412,17 @@ init_hm(void)
serv_sin.sin_port = (sp) ? sp->s_port : SERVER_SVC_FALLBACK; serv_sin.sin_port = (sp) ? sp->s_port : SERVER_SVC_FALLBACK;
#ifndef DEBUG #ifndef DEBUG
if (!inetd && !nofork) if (!inetd && !nofork) {
detach(); detach();
}
else {
/* Write pid to file */ /* Write pid to file */
fp = fopen(PidFile, "w"); fp = fopen(PidFile, "w");
if (fp != NULL) { if (fp != NULL) {
fprintf(fp, "%d\n", getpid()); fprintf(fp, "%d\n", getpid());
fclose(fp); fclose(fp);
} }
}
#endif /* DEBUG */ #endif /* DEBUG */
if (hmdebug) { if (hmdebug) {
@ -469,11 +471,18 @@ detach(void)
/* detach from terminal and fork. */ /* detach from terminal and fork. */
register int i, x = ZGetFD(); register int i, x = ZGetFD();
register long size; register long size;
FILE *fp;
i = fork(); i = fork();
if (i) { if (i) {
if (i < 0) if (i < 0) {
perror("fork"); perror("fork");
}
fp = fopen(PidFile, "w");
if (fp != NULL) {
fprintf(fp, "%d\n", i);
fclose(fp);
}
exit(0); exit(0);
} }
#ifdef _POSIX_VERSION #ifdef _POSIX_VERSION