mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code & style cleanup

Browse Source
This commit is contained in:
marschap
2007-06-23 21:41:50 +00:00
parent 2f9f70e87e
commit a5bdc61ad8
12 changed files with 665 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/commands/client_commands.c
+52 -69
View File
@@ -1,5 +1,8 @@
/* \file client_commands.c
* Defines handlers for general client commands.
*/
/*
* client_commands.c
* This file is part of LCDd, the lcdproc server.
*
* This file is released under the GNU General Public License. Refer to the
@@ -14,9 +17,6 @@
*
* The client's available function set is defined here, as is the syntax
* for each command.
*
* This particular file defines actions concerning clients.
*
*/
#include <unistd.h>
@@ -38,15 +38,13 @@
* Debugging only.. prints out a list of arguments it receives
*/
int
test_func_func (Client * c, int argc, char **argv)
test_func_func(Client *c, int argc, char **argv)
{
int i;
char str[256];
for (i = 0; i < argc; i++) {
snprintf (str, sizeof(str), "%s: %i -> %s\n", __FUNCTION__, i, argv[i]);
report (RPT_INFO, "%s", str);
sock_send_string (c->sock, str);
report(RPT_INFO, "%s: %i -> %s", __FUNCTION__, i, argv[i]);
sock_printf(c->sock, "%s: %i -> %s\n", __FUNCTION__, i, argv[i]);
}
return 0;
}
@@ -59,10 +57,8 @@ test_func_func (Client * c, int argc, char **argv)
* Usage: hello
*/
int
hello_func (Client * c, int argc, char **argv)
hello_func(Client *c, int argc, char **argv)
{
char str[256];
/* TODO: Give *real* info about the server/lcd...*/
if (argc > 1) {
@@ -71,14 +67,12 @@ hello_func (Client * c, int argc, char **argv)
debug(RPT_INFO, "Hello!");
memset(str, '\0', sizeof(str));
snprintf(str, sizeof(str), "connect LCDproc %s protocol %s lcd wid %i hgt %i cellwid %i cellhgt %i\n",
sock_printf(c->sock, "connect LCDproc %s protocol %s lcd wid %i hgt %i cellwid %i cellhgt %i\n",
VERSION, PROTOCOL_VERSION,
display_props->width, display_props->height,
display_props->cellwidth, display_props->cellheight);
sock_send_string (c->sock, str);
/* make note that client has sent hello */
c->ack = 1;
return 0;
@@ -92,7 +86,7 @@ hello_func (Client * c, int argc, char **argv)
* Usage: bye
*/
int
bye_func (Client * c, int argc, char **argv)
bye_func(Client *c, int argc, char **argv)
{
if (c != NULL) {
debug(RPT_INFO, "Bye, %s!", (c->name != NULL) ? c->name : "unknown client");
@@ -108,12 +102,10 @@ bye_func (Client * c, int argc, char **argv)
* Usage: client_set -name <id>
*/
int
client_set_func (Client * c, int argc, char **argv)
client_set_func(Client *c, int argc, char **argv)
{
int i;
char str[256];
memset(str, '\0', sizeof(str));
if (!c->ack)
return 1;
@@ -124,40 +116,35 @@ client_set_func (Client * c, int argc, char **argv)
i = 1;
do {
char *p;
char *p = argv[i];
/* This bit of code means that "-name" is the same as "name"...*/
p = argv[i];
/* ignore leading '-' in options: we allow both forms */
if (*p == '-')
p++;
/* Handle the "name" parameter*/
if (strcmp (p, "name") == 0) {
/* Handle the "name" option */
if (strcmp(p, "name") == 0) {
i++;
if (argv[i] == '\0') {
sock_printf_error(c->sock, "internal error: no parameter #%d\n", i);
continue;
}
if (strlen(argv[i]) > sizeof(str) -1) {
sock_send_error(c->sock, "name too long\n");
} else {
strncpy(str, argv[i], sizeof(str) - 1);
debug(RPT_DEBUG, "client_set: name=\"%s\"", argv[i]);
debug(RPT_DEBUG, "client_set: name=\"%s\"", argv[i]);
/* set the name...*/
if (c->name != NULL)
free(c->name);
/* set the name...*/
if (c->name)
free (c->name);
if ((c->name = strdup (str)) == NULL) {
sock_send_error(c->sock, "error allocating memory!\n");
} else {
sock_send_string(c->sock, "success\n");
i++; /* bypass argument (name string)*/
}
if ((c->name = strdup(argv[i])) == NULL) {
sock_send_error(c->sock, "error allocating memory!\n");
}
} else {
else {
sock_send_string(c->sock, "success\n");
i++; /* bypass argument (name string)*/
}
}
else {
sock_printf_error(c->sock, "invalid parameter (%s)\n", p);
}
} while (++i < argc);
@@ -171,9 +158,8 @@ client_set_func (Client * c, int argc, char **argv)
*
* Usage: client_add_key [-exclusively|-shared] {<key>}+
*/
#define BUFLEN 80
int
client_add_key_func (Client * c, int argc, char **argv)
client_add_key_func(Client *c, int argc, char **argv)
{
int exclusively = 0;
int argnr;
@@ -187,20 +173,20 @@ client_add_key_func (Client * c, int argc, char **argv)
}
argnr = 1;
if( argv[argnr][0] == '-' ) {
if( strcmp( argv[argnr], "-shared") == 0 ) {
if (argv[argnr][0] == '-') {
if (strcmp( argv[argnr], "-shared") == 0) {
exclusively = 0;
}
else if( strcmp( argv[argnr], "-exclusively") == 0 ) {
else if(strcmp(argv[argnr], "-exclusively") == 0) {
exclusively = 1;
}
else {
sock_printf_error(c->sock, "Invalid option: %s\n", argv[argnr]);
}
argnr ++;
argnr++;
}
for ( ; argnr < argc; argnr++ ) {
if( input_reserve_key( argv[argnr], exclusively, c ) < 0 ) {
for ( ; argnr < argc; argnr++) {
if (input_reserve_key(argv[argnr], exclusively, c) < 0) {
sock_printf_error(c->sock, "Could not reserve key \"%s\"\n", argv[argnr]);
}
}
@@ -216,7 +202,7 @@ client_add_key_func (Client * c, int argc, char **argv)
* Usage: client_del_key {<key>}+
*/
int
client_del_key_func (Client * c, int argc, char **argv)
client_del_key_func(Client *c, int argc, char **argv)
{
int argnr;
@@ -228,8 +214,8 @@ client_del_key_func (Client * c, int argc, char **argv)
return 0;
}
for( argnr=1; argnr < argc; argnr++) {
input_release_key( argv[argnr], c );
for (argnr = 1; argnr < argc; argnr++) {
input_release_key(argv[argnr], c);
}
sock_send_string(c->sock, "success\n");
@@ -242,7 +228,7 @@ client_del_key_func (Client * c, int argc, char **argv)
* Usage: backlight {on|off|toggle|blink|flash}
*/
int
backlight_func (Client * c, int argc, char **argv)
backlight_func(Client *c, int argc, char **argv)
{
if (!c->ack)
return 1;
@@ -252,27 +238,27 @@ backlight_func (Client * c, int argc, char **argv)
return 0;
}
debug (RPT_DEBUG, "backlight(%s)", argv[1]);
debug(RPT_DEBUG, "backlight(%s)", argv[1]);
//backlight = (backlight && 1); /* only preserves ON/OFF bit*/
if (strcmp ("on", argv[1]) == 0) {
c->backlight = BACKLIGHT_ON;
} else if (strcmp ("off", argv[1]) == 0) {
}
else if (strcmp ("off", argv[1]) == 0) {
c->backlight = BACKLIGHT_OFF;
} else if (strcmp ("toggle", argv[1]) == 0) {
}
else if (strcmp ("toggle", argv[1]) == 0) {
if (c->backlight == BACKLIGHT_ON)
c->backlight = BACKLIGHT_OFF;
else if (c->backlight == BACKLIGHT_OFF)
c->backlight = BACKLIGHT_ON;
} else if (strcmp ("blink", argv[1]) == 0) {
}
else if (strcmp ("blink", argv[1]) == 0) {
c->backlight |= BACKLIGHT_BLINK;
} else if (strcmp ("flash", argv[1]) == 0) {
}
else if (strcmp ("flash", argv[1]) == 0) {
c->backlight |= BACKLIGHT_FLASH;
}
@@ -288,19 +274,16 @@ backlight_func (Client * c, int argc, char **argv)
* Usage: info
*/
int
info_func (Client * c, int argc, char **argv)
info_func(Client *c, int argc, char **argv)
{
char str[1024];
if (!c->ack)
return 1;
if (argc > 1) {
sock_send_error(c->sock, "Extra arguments ignored...\n");
}
memset(str, '\0', sizeof(str));
snprintf (str, sizeof(str)-1, "%s\n", drivers_get_info());
str[sizeof(str)-1] = '\0';
sock_send_string (c->sock, str);
sock_printf(c->sock, "%s\n", drivers_get_info());
return 0;
}