ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added proper getopt options and usage. Removed HUP handling. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@216 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2002-12-24 12:02:08 +00:00
parent 4541b32d20
commit 80f4096976
1 changed files with 64 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/zmc.cpp
View File

@ -17,29 +17,81 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// //
#include <getopt.h>
#include "zm.h" #include "zm.h"
bool reload = false;
bool terminate = false; bool terminate = false;
void hup_handler( int signal )
{
Info(( "Got HUP signal, reloading" ));
reload = true;
}
void term_handler( int signal ) void term_handler( int signal )
{ {
Info(( "Got TERM signal, exiting" )); Info(( "Got TERM signal, exiting" ));
terminate = true; terminate = true;
} }
int main( int argc, const char *argv[] ) void Usage()
{ {
int device = argv[1]?atoi( argv[1] ):0; fprintf( stderr, "zmc -d <device_id>\n" );
fprintf( stderr, "Options:\n" );
fprintf( stderr, " -d, --device <device_id> : Specify which device to access, 0=>/dev/video0 etc\n" );
fprintf( stderr, " -h, --help : This screen\n" );
exit( 0 );
}
int main( int argc, char *argv[] )
{
int device = -1;
static struct option long_options[] = {
{"device", 1, 0, 'd'},
{"help", 0, 0, 'h'},
{0, 0, 0, 0}
};
while (1)
{
int this_option_optind = optind ? optind : 1;
int option_index = 0;
int opterr = 1;
int c = getopt_long (argc, argv, "d:h", long_options, &option_index);
if (c == -1)
{
break;
}
switch (c)
{
case 'd':
device = atoi(optarg);
break;
case 'h':
case '?':
Usage();
break;
default:
//fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );
break;
}
}
if (optind < argc)
{
fprintf( stderr, "Extraneous options, " );
while (optind < argc)
printf ("%s ", argv[optind++]);
printf ("\n");
Usage();
}
if ( device < 0 )
{
fprintf( stderr, "Bogus device %d\n", device );
Usage();
exit( 0 );
}
char dbg_name_string[16]; char dbg_name_string[16];
sprintf( dbg_name_string, "zmc-%d", device ); sprintf( dbg_name_string, "zmc-d%d", device );
dbg_name = dbg_name_string; dbg_name = dbg_name_string;
DbgInit(); DbgInit();
@ -67,15 +119,12 @@ int main( int argc, const char *argv[] )
sigset_t block_set; sigset_t block_set;
sigemptyset( &block_set ); sigemptyset( &block_set );
struct sigaction action, old_action; struct sigaction action, old_action;
action.sa_handler = hup_handler;
action.sa_mask = block_set;
action.sa_flags = 0;
sigaction( SIGHUP, &action, &old_action );
action.sa_handler = term_handler; action.sa_handler = term_handler;
action.sa_mask = block_set; action.sa_mask = block_set;
action.sa_flags = 0; action.sa_flags = 0;
sigaction( SIGTERM, &action, &old_action ); sigaction( SIGTERM, &action, &old_action );
sigaddset( &block_set, SIGHUP );
//sigaddset( &block_set, SIGTERM ); //sigaddset( &block_set, SIGTERM );
if ( n_monitors == 1 ) if ( n_monitors == 1 )
{ {
@ -91,16 +140,6 @@ int main( int argc, const char *argv[] )
monitors[i]->PostCapture(); monitors[i]->PostCapture();
} }
sigprocmask( SIG_UNBLOCK, &block_set, 0 ); sigprocmask( SIG_UNBLOCK, &block_set, 0 );
if ( reload )
{
for ( int i = 0; i < n_monitors; i++ )
{
delete monitors[i];
}
monitors = 0;
n_monitors = Monitor::Load( device, monitors );
reload = false;
}
if ( terminate ) if ( terminate )
{ {
for ( int i = 0; i < n_monitors; i++ ) for ( int i = 0; i < n_monitors; i++ )