dsctl-devel Mailing List for Dsctl - Digital scanner control program (Page 3)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 94
          http://dsctl.svn.sourceforge.net/dsctl/?rev=94&view=rev
Author:   roger-linux
Date:     2007-07-11 23:36:31 -0700 (Wed, 11 Jul 2007)

Log Message:
-----------

human_commands.c: Adds something I'm experimenting with just printing the output of STS command to console. (-e or --test undocumented option).

main.c: This also fixes command line bug where switches would only work after the command specified.

main.h & main.c: Removed an not needed function for these BCD models.


Signed-off-by: Roger <ro...@es...>
Acked-by: Roger <ro...@es...>

Modified Paths:
--------------
    src/human_commands.c
    src/main.c
    src/main.h
    src/usage.c

Modified: src/human_commands.c
===================================================================

--- src/human_commands.c	2007-07-12 04:24:28 UTC (rev 93)
+++ src/human_commands.c	2007-07-12 06:36:31 UTC (rev 94)
@@ -159,6 +159,7 @@
 		
 		get_current_tgid_status(fd);
 	}
+	/* Give the user a daemon mode */
 	else if (daemon_mode == 1)
 	{
 		while (daemon_mode != 0)
@@ -172,6 +173,15 @@
 			sleep(1);
 		}
 	}
+	/* User just wants a console display in deamon mode*/
+	else if (daemon_mode == 2)
+	{
+		while (daemon_mode != 0)
+		{
+			get_current_status(fd);
+			sleep(1);
+		}
+	}
 }
 
 /***********************************************************************

Modified: src/main.c
===================================================================
--- src/main.c	2007-07-12 04:24:28 UTC (rev 93)
+++ src/main.c	2007-07-12 06:36:31 UTC (rev 94)
@@ -57,8 +57,6 @@
 	FILE *configfile;
 	char errorstr[100];
 
-	signal(SIGINT, sighandler);
-
 	bzero(serial_port, 20);
 
 	cmd_loc = 1;
@@ -150,6 +148,7 @@
 		{
 			bzero(serial_port, 20);
 			strncat(serial_port, argv[++i], 20);
+
 			cmd_loc += 2;
 			cmd_arg_loc += 2;
 		}
@@ -157,16 +156,35 @@
 		else if (strcmp(argv[i], "-b") == 0 || strcmp(argv[i], "--baud") == 0)	/* baud rate */
 		{
 			baud_rate = atoi(argv[++i]);
+
 			cmd_loc += 2;
 			cmd_arg_loc += 2;
 		}
 
 		else if (strcmp(argv[i], "-d") == 0 || strcmp(argv[i], "--daemon") == 0)	/* daemon mode */
+		{
 			daemon_mode = 1;
 
+			cmd_loc += 1;
+			cmd_arg_loc += 1;
+		}
+
+		else if (strcmp(argv[i], "-e") == 0 || strcmp(argv[i], "--test") == 0)	/* daemon mode */
+		{
+			daemon_mode = 2;
+
+			cmd_loc += 1;
+			cmd_arg_loc += 1;
+		}
+
 		else if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0)	/* help */
+		{
 			usage(C_NONE);
 
+			cmd_loc += 1;
+			cmd_arg_loc += 1;
+		}
+
 		else if (strcmp(argv[i], "-m") == 0 || strcmp(argv[i], "--model") == 0)	/* model */
 		{
 			char mdl[9], *p;
@@ -180,13 +198,19 @@
 				scannermodel = BCD396T;
 			else
 				scannermodel = MODELUNKNOWN;	/* error will be caught below */
-
+			
 			cmd_loc += 2;
 			cmd_arg_loc += 2;
 		}
 
 		else if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--verbose") == 0)	/* debug */
+		{
 			debug = 1;
+		
+
+			cmd_loc += 1;
+			cmd_arg_loc += 1;
+		}
 	}
 
 	/* now set our variables that can be passed in to human functions */
@@ -276,44 +300,3 @@
 	return (-1);
 }
 
-/***********************************************************************
- * a signal handler to reset the scanner's mode, useful mostly for
- id_report() at this point.
- ***********************************************************************/
-void sighandler(int sig)
-{
-	char answer[100];
-	int exitcode;
-
-	signal(sig, SIG_IGN);
-
-	bzero(answer, 100);
-	do_command(fd, "IDF", answer);
-
-	if (strncmp(answer, "OK", 2) == 0)
-	{
-		puts("ID report mode disabled\n");
-
-		exitcode = 0;
-	}
-	else
-	{
-		puts("Unable to disable ID report mode\n");
-		exitcode = 1;
-	}
-
-	bzero(answer, 100);
-	do_command(fd, "QUF", answer);
-
-	if (strncmp(answer, "OK", 2) == 0)
-	{
-		puts("Scan report mode disabled\n");
-	}
-	else
-	{
-		puts("Unable to disable scan report mode\n");
-		exitcode = 1;
-	}
-
-	exit(exitcode);
-}

Modified: src/main.h
===================================================================
--- src/main.h	2007-07-12 04:24:28 UTC (rev 93)
+++ src/main.h	2007-07-12 06:36:31 UTC (rev 94)
@@ -50,6 +50,5 @@
  ***********************************************************************/
 
 int get_cmd(char *cmd);
-void sighandler(int sig);
 
 #endif /* _MAIN_H_ */

Modified: src/usage.c
===================================================================
--- src/usage.c	2007-07-12 04:24:28 UTC (rev 93)
+++ src/usage.c	2007-07-12 06:36:31 UTC (rev 94)
@@ -61,7 +61,7 @@
 
 		default:
 			fprintf(stderr,
-					"\n  Usage: dsctl [-p port] [-b baud rate] [-m scannermodel] command options\n\n");
+					"\n  Usage: dsctl [-p port] [-b baud rate] [-m scannermodel] command\n\n");
 
 			fprintf(stderr,
 					"  (It's important a space is used between the command letter and it's argument.)\n\n");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2007	Jan	Feb	Mar	Apr	May	Jun (59)	Jul (76)	Aug (1)	Sep	Oct	Nov (5)	Dec
2008	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec

dsctl-devel Mailing List for Dsctl - Digital scanner control program (Page 3)

dsctl-devel — Discussion mailing list for Uniden digital scanners