[Dsctl-devel] SF.net SVN: dsctl: [134] src

[<rog...@us...>]

Revision: 134
          http://dsctl.svn.sourceforge.net/dsctl/?rev=134&view=rev
Author:   roger-linux
Date:     2007-07-24 22:39:41 -0700 (Tue, 24 Jul 2007)

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

human_commands.c: FIXED bug where daemon_mode nor ncurses modes would work.

commands.c
commands.h: indent syntax.

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

Modified Paths:
--------------
    src/commands.c
    src/commands.h
    src/human_commands.c

Modified: src/commands.c
===================================================================
--- src/commands.c	2007-07-24 08:32:34 UTC (rev 133)
+++ src/commands.c	2007-07-25 05:39:41 UTC (rev 134)
@@ -137,7 +137,6 @@
 			strncpy(field[6], "SCANNING\0", 17);
 	}
 
-
 	/*if (daemon_mode == 0 || osd == 0)
 	   {
 	   printf("Display Status:\n");

Modified: src/commands.h
===================================================================
--- src/commands.h	2007-07-24 08:32:34 UTC (rev 133)
+++ src/commands.h	2007-07-25 05:39:41 UTC (rev 134)
@@ -89,7 +89,7 @@
 int append_channel_group(int fd, int system_index);
 int append_tgid_group(int fd, int system_index);
 
-																					  /*int delete_group(int fd, group_index); *//* Use same function for delete_site */
+																																 /*int delete_group(int fd, group_index); *//* Use same function for delete_site */
 int get_group_info(int fd, int group_index, char *channel_index);
 int set_group_info(int fd, int group_index, char **parsed_line);
 int append_channel_freq(int fd, int group_index);	/* Use same function for append_trunk_freq */

Modified: src/human_commands.c
===================================================================
--- src/human_commands.c	2007-07-24 08:32:34 UTC (rev 133)
+++ src/human_commands.c	2007-07-25 05:39:41 UTC (rev 134)
@@ -181,73 +181,75 @@
  ***********************************************************************/
 void human_do_status(int fd, int argc, char **args)
 {
+	printf("daemon_mode == %i, osd == %i\n", daemon_mode, osd);
 	/* We have three types of displays */
 	/* FIXME: Display gets corrupt if stuck in prg_mode! */
-	while (daemon_mode != 0)
+
+	/* Give the user a repeated scrolling display (daemon) */
+	if ((osd == 0) && (daemon_mode == 1))
 	{
-		if (osd == 0)
+		while (osd == 0)		/* simple endless loop */
 		{
-			/* Give the user a repeated scrolling display (daemon) */
 			get_current_status(fd);
 			get_reception_status(fd);
 			get_current_tgid_status(fd);
 
 			sleep(.5);
 		}
-		else if (osd == 1)
-		{
-			/* User wants a live repeated ncurses display. (implies deamon mode) */
-			char buf[1024];
-			char buf2[30];
-			char *ap = buf2;
-			char *osd_clear, *osd_clear_line, *osd_up, *osd_cr;
+	}
 
-			/* I can't make the cursor invisible :- */
-			/*char *osd_invisible, *osd_visible; */
+	/* User wants a live repeated ncurses display. (implies deamon mode) */
+	else if ((osd == 1) && (daemon_mode == 1))
+	{
+		char buf[1024];
+		char buf2[30];
+		char *ap = buf2;
+		char *osd_clear, *osd_clear_line, *osd_up, *osd_cr;
 
-			tgetent(buf, getenv("TERM"));
+		/* I can't make the cursor invisible :- */
+		/*char *osd_invisible, *osd_visible; */
 
-			osd_clear = tgetstr("cl", &ap);
-			osd_clear_line = tgetstr("ce", &ap);
-			osd_up = tgetstr("up", &ap);
-			osd_cr = tgetstr("cr", &ap);
-			/* FIXME: Why segfault ??? Should also be defined along w/ "vi"! */
-			/*osd_invisible = tgetstr("vi", &ap); */
-			/*osd_visible = tgetstr("ve", &ap); */
+		tgetent(buf, getenv("TERM"));
 
-			while (osd == 0)	/* simple endless loop */
-			{
-				int i = 0;
+		osd_clear = tgetstr("cl", &ap);
+		osd_clear_line = tgetstr("ce", &ap);
+		osd_up = tgetstr("up", &ap);
+		osd_cr = tgetstr("cr", &ap);
+		/* FIXME: Why segfault ??? Should also be defined along w/ "vi"! */
+		/*osd_invisible = tgetstr("vi", &ap); */
+		/*osd_visible = tgetstr("ve", &ap); */
 
-				if (debug > 0)
-					printf("osd value == %i\n", osd);
+		while (osd == 1)		/* simple endless loop */
+		{
+			int i = 0;
 
-				fputs(osd_clear_line, stdout);
-				fputs(osd_clear_line, stdout);
-				get_current_status(fd);
-				printf("\n");
+			if (debug > 0)
+				printf("osd value == %i\n", osd);
 
-				fputs(osd_clear_line, stdout);
-				get_reception_status(fd);
-				printf("\n");
+			fputs(osd_clear_line, stdout);
+			fputs(osd_clear_line, stdout);
+			get_current_status(fd);
+			printf("\n");
 
-				fputs(osd_clear_line, stdout);
-				get_current_tgid_status(fd);
-				/* FIXME: Want cursor to be invisible! Also see leaveok() */
-				/*fputs(osd_invisible, stdout); */
+			fputs(osd_clear_line, stdout);
+			get_reception_status(fd);
+			printf("\n");
 
-				for (i = 1; i <= 6; i++)
-					fputs(osd_up, stdout);
+			fputs(osd_clear_line, stdout);
+			get_current_tgid_status(fd);
+			/* FIXME: Want cursor to be invisible! Also see leaveok() */
+			/*fputs(osd_invisible, stdout); */
 
-				curs_set(0);
-				sleep(.5);
-			}
+			for (i = 1; i <= 6; i++)
+				fputs(osd_up, stdout);
+
+			curs_set(0);
+			sleep(.5);
 		}
-
 	}
 
 	/* Just print once & exit */
-	if (daemon_mode == 0)
+	else
 	{
 		get_current_status(fd);
 


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