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

This is a "cleaner" fix (hack) to get around s getting clobbered

Browse Source 
in main.c.  It also documents extensively WHERE it is getting clobbered;
now if one only knew why.....
This commit is contained in:
ddouthitt
2001-10-06 01:27:09 +00:00
parent 10a79e3859
commit f8b89f2666
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/main.c
+16 -1
View File
@@ -126,7 +126,10 @@ main (int argc, char **argv)
int i, err; int i, err;
int daemon_mode = 1; int daemon_mode = 1;
int disable_server_screen = 1; int disable_server_screen = 1;
// FIXME: s is getting clobbered - in MANY places!!!
screen *s = NULL; screen *s = NULL;
//char *str, *ing; // strings for commandline handling //char *str, *ing; // strings for commandline handling
char user[64]; char user[64];
char c, buf[64], *driverlist[MAX_DRIVERS], *driverargs[MAX_DRIVERS]; char c, buf[64], *driverlist[MAX_DRIVERS], *driverargs[MAX_DRIVERS];
@@ -171,6 +174,8 @@ main (int argc, char **argv)
i = 0; i = 0;
// analyze options here.. // analyze options here..
while ((c = getopt(argc, argv, "a:p:d:hfiw:c:u:")) > 0) { while ((c = getopt(argc, argv, "a:p:d:hfiw:c:u:")) > 0) {
// FIXME: Setting of c in this loop clobbers s!
// s is set equivalent to c.
switch(c) { switch(c) {
case 'd': case 'd':
// Add to a list of drivers to be initialized later... // Add to a list of drivers to be initialized later...
@@ -265,6 +270,8 @@ main (int argc, char **argv)
driver_index = -1; driver_index = -1;
linebuf[strlen(linebuf) - 1] = '\0'; linebuf[strlen(linebuf) - 1] = '\0';
// FIXME: This sets s to point to the current driver_name!!!
strncpy(driver_name, linebuf + 1, sizeof(driver_name)); strncpy(driver_name, linebuf + 1, sizeof(driver_name));
for (i = 0; i < MAX_DRIVERS; i++) { for (i = 0; i < MAX_DRIVERS; i++) {
@@ -361,6 +368,9 @@ main (int argc, char **argv)
strcpy(driverlist[0], DEFAULT_DRIVER); strcpy(driverlist[0], DEFAULT_DRIVER);
} }
// FIXME: This sets s equal to a value related to i
// (bitshifted left?) FIX FIX FIX ARGH....
//
// Go thru all drivers and initialize all of them // Go thru all drivers and initialize all of them
for (i = 0; i < MAX_DRIVERS; i++) { for (i = 0; i < MAX_DRIVERS; i++) {
if (driverlist[i] == NULL) if (driverlist[i] == NULL)
@@ -622,6 +632,8 @@ main (int argc, char **argv)
syslog(LOG_DEBUG, "framebuffer at %0X", syslog(LOG_DEBUG, "framebuffer at %0X",
lcd_ptr->framebuf); lcd_ptr->framebuf);
// FIXME: s should still be null from initialization.... what's happening here?!
s = NULL;
while (1) { while (1) {
sock_poll_clients (); // poll clients for input sock_poll_clients (); // poll clients for input
parse_all_client_messages (); // analyze input from network clients parse_all_client_messages (); // analyze input from network clients
@@ -633,10 +645,13 @@ main (int argc, char **argv)
timer++; timer++;
//if (s == NULL)
// s = screenlist_current();
// this is here because s is getting overwritten... // this is here because s is getting overwritten...
//if (s != screenlist_current()) { //if (s != screenlist_current()) {
// syslog(LOG_DEBUG, "internal error! s was found overwritten at main.c:637"); // syslog(LOG_DEBUG, "internal error! s was found overwritten at main.c:637");
s = screenlist_current(); // s = screenlist_current();
//} //}
// //
//TODO: THIS MUST BE FIXED..... WHY is s getting overwritten? //TODO: THIS MUST BE FIXED..... WHY is s getting overwritten?