Fixing two Debian-reported bugs.

jedwing · jedwing · commit deca6eed5fee · 2009-05-23T07:41:57.000-07:00
1. chm_http begins to refuse connections after a while (created threads were
   never joined...)

2. bashism used in user-contributed script mozilla_helper.sh
diff --git a/contrib/mozilla_helper.sh b/contrib/mozilla_helper.sh
@@ -8,15 +8,13 @@ echo "unpacking :$*: on $host:$port" >/tmp/chm.log
 chm_http --port=$port --bind=$host "$*" >chm.log 2>&1 &
 
 HTTP=/tmp/chm2http.html
-echo -e "<html><head>\n<title>$*</title>" >$HTTP
-echo -e "<meta http-equiv='refresh' content=\"5;
-url=http://$host:$port/\">" >>$HTTP
-echo -e "<title>working</title></head>" >>$HTTP
-echo -e "<body>please wait while I unpack :$*:<br>working...<br><br>"
->>$HTTP
-echo -e "chm_http reports:<br>" >>$HTTP
+echo "<html><head><title>$*</title>" >$HTTP
+echo "<meta http-equiv='refresh' content=\"5; url=http://$host:$port/\">" >>$HTTP
+echo "<title>working</title></head>" >>$HTTP
+echo "<body>please wait while I unpack :$*:<br>working...<br><br>" >>$HTTP
+echo "chm_http reports:<br>" >>$HTTP
 cat chm.log >>$HTTP
-echo -e "</body></html>" >>$HTTP
+echo "</body></html>" >>$HTTP
 
 mozilla -remote "openURL($HTTP)"
 rm -f /tmp/chm.log /tmp/chm2http.html
diff --git a/src/chm_http.c b/src/chm_http.c
@@ -193,6 +193,7 @@ static void chmhttp_server(const char *filename)
             break;
 
         pthread_create(&tid, NULL, _slave, (void *)slave);
+        pthread_detach(&tid);
     }
     free(slave);
 }

Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,7 @@ static void chmhttp_server(const char *filename)`
`193`	`193`	`break;`
`194`	`194`
`195`	`195`	`pthread_create(&tid, NULL, _slave, (void *)slave);`
	`196`	`+ pthread_detach(&tid);`
`196`	`197`	`}`
`197`	`198`	`free(slave);`
`198`	`199`	`}`