Commit 365fdd7494ee0dd05af647872b451d6d8a229cf6

Authored by Georg Hopp
1 parent 7711950d

more valgrind indicated fixes

Showing 1 changed file with 7 additions and 5 deletions
@@ -153,10 +153,8 @@ main() @@ -153,10 +153,8 @@ main()
153 value->value = rand() % 100; 153 value->value = rand() % 100;
154 sigsuspend(&pause_mask); 154 sigsuspend(&pause_mask);
155 } 155 }
156 -  
157 - memCleanup();  
158 - _exit(EXIT_SUCCESS);  
159 } 156 }
  157 + break;
160 158
161 default: 159 default:
162 { 160 {
@@ -202,6 +200,11 @@ main() @@ -202,6 +200,11 @@ main()
202 users = new(Storage, user_storage); 200 users = new(Storage, user_storage);
203 passwords = new(Storage, password_storage); 201 passwords = new(Storage, password_storage);
204 202
  203 + if (NULL == users || NULL == passwords) {
  204 + puts("error opening database files...\n");
  205 + doShutdown = 1;
  206 + }
  207 +
205 authCreate(auth, AUTH_STORAGE, passwords); 208 authCreate(auth, AUTH_STORAGE, passwords);
206 209
207 application = new( 210 application = new(
@@ -225,11 +228,10 @@ main() @@ -225,11 +228,10 @@ main()
225 (int)(port->value).number, 228 (int)(port->value).number,
226 SOMAXCONN); 229 SOMAXCONN);
227 230
228 - if (NULL != server) { 231 + if (NULL != server && !doShutdown) {
229 serverRun(server); 232 serverRun(server);
230 } 233 }
231 else { 234 else {
232 - doShutdown = 1;  
233 kill(pid, SIGINT); 235 kill(pid, SIGINT);
234 } 236 }
235 237
Please register or login to post a comment