diff options
| author | Simon Rettberg | 2015-12-16 18:20:55 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2015-12-16 18:20:55 +0100 |
| commit | 2bc1381256c860b6deb3044d3263cea625118793 (patch) | |
| tree | faab7420d098dde40b8fc86bb8d51efcb5811205 /src/server/server.c | |
| parent | [SERVER] Fix image_calcBlockCrc32: Use 64bit for fileSize param (diff) | |
| download | dnbd3-2bc1381256c860b6deb3044d3263cea625118793.tar.gz dnbd3-2bc1381256c860b6deb3044d3263cea625118793.tar.xz dnbd3-2bc1381256c860b6deb3044d3263cea625118793.zip | |
[SERVER] Cancel scanning of image dir if _shutdown is set
So you can cancel image loading on startup via Ctrl-C
Diffstat (limited to 'src/server/server.c')
| -rw-r--r-- | src/server/server.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server/server.c b/src/server/server.c index ffa817f..dd71312 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -286,9 +286,11 @@ int main(int argc, char *argv[]) logadd( LOG_INFO, "Loading images...." ); // Load all images in base path - if ( !image_loadAll( NULL ) ) { + if ( !image_loadAll( NULL ) || _shutdown ) { logadd( LOG_ERROR, "Could not load images." ); - return EXIT_FAILURE; + free( bindAddress ); + dnbd3_cleanup(); + return 0; } startupTime = time( NULL ); |