snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

wmppp.app: Reread configuration file.

Browse source 
Based in part on a patch by Chris Gray [1] to fix Debian bug #50181 [2].

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=12;filename=wmppp.diff;att=1;bug=50181
[2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=50181
This commit is contained in:
Doug Torrance 2015-05-19 22:31:09 -05:00 committed by Carlos R. Mafra
parent 2b0feb59f8
commit 3c16ef37ec
1 changed files with 36 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
wmppp.app/wmppp.c
View file

@ -161,6 +161,7 @@
#include <sys/socket.h> /* for SOCK_DGRAM */ #include <sys/socket.h> /* for SOCK_DGRAM */
#include <linux/ppp_defs.h> /* for ppp_stats, pppstat */ #include <linux/ppp_defs.h> /* for ppp_stats, pppstat */
#include <net/if_ppp.h> /* for ifpppstatsreq, etc */ #include <net/if_ppp.h> /* for ifpppstatsreq, etc */
#include <signal.h> /* for signal */
#include <stdio.h> /* for fprintf, stderr, NULL, etc */ #include <stdio.h> /* for fprintf, stderr, NULL, etc */
#include <stdlib.h> /* for exit, atoi, getenv, etc */ #include <stdlib.h> /* for exit, atoi, getenv, etc */
#include <string.h> /* for strcpy, memset, strcmp, etc */ #include <string.h> /* for strcpy, memset, strcmp, etc */
@ -261,6 +262,7 @@ void ButtonDown(int);
int get_statistics(long *, long *, long *, long *); int get_statistics(long *, long *, long *, long *);
void get_ppp_stats(struct ppp_stats *cur); void get_ppp_stats(struct ppp_stats *cur);
int stillonline(char *); int stillonline(char *);
void reread(int);
char *start_action = NULL; char *start_action = NULL;
char *stop_action = NULL; char *stop_action = NULL;
@ -351,11 +353,13 @@ int parse_cmdline(int argc, char *argv[]) {
return 0; return 0;
} }
/********/ /**********/
/* Main */ /* reread */
/********/ /**********/
int main(int argc, char **argv) { void reread(int signal) {
char *p;
char temp[128];
rckeys wmppp_keys[] = { rckeys wmppp_keys[] = {
{ "start", &start_action }, { "start", &start_action },
@ -366,6 +370,30 @@ int main(int argc, char **argv) {
{ NULL, NULL } { NULL, NULL }
}; };
strcpy(temp, "/etc/wmppprc");
parse_rcfile(temp, wmppp_keys);
p = getenv("HOME");
if (p == NULL) {
fprintf(stderr,
"error: HOME environment variable not defined\n");
exit(EXIT_FAILURE);
}
strcpy(temp, p);
strcat(temp, "/.wmppprc");
parse_rcfile(temp, wmppp_keys);
strcpy(temp, "/etc/wmppprc.fixed");
parse_rcfile(temp, wmppp_keys);
}
/********/
/* Main */
/********/
int main(int argc, char **argv) {
int j; int j;
int but_stat; int but_stat;
@ -389,7 +417,6 @@ int main(int argc, char **argv) {
XEvent Event; XEvent Event;
char *p;
char temp[128]; char temp[128];
int speed_ind=60; int speed_ind=60;
@ -416,24 +443,9 @@ int main(int argc, char **argv) {
stamp_file = strdup (temp); stamp_file = strdup (temp);
#endif #endif
reread(0);
strcpy(temp, "/etc/wmppprc");
parse_rcfile(temp, wmppp_keys);
p = getenv("HOME");
if (p == NULL) {
fprintf(stderr,
"error: HOME environment variable not defined\n");
exit(EXIT_FAILURE);
}
strcpy(temp, p);
strcat(temp, "/.wmppprc");
parse_rcfile(temp, wmppp_keys);
strcpy(temp, "/etc/wmppprc.fixed");
parse_rcfile(temp, wmppp_keys);
parse_cmdline(argc, argv); parse_cmdline(argc, argv);
signal(SIGHUP, reread);
/* Open the display */ /* Open the display */
@ -636,6 +648,8 @@ int main(int argc, char **argv) {
switch (i) { switch (i) {
case 0: case 0:
if (!starttime) { if (!starttime) {
/* Reread the rcfiles. */
reread(0);
copyXPMArea(28, 95, 25, 11, 5, 48); copyXPMArea(28, 95, 25, 11, 5, 48);
DrawTime(0, 1); DrawTime(0, 1);
if (start_action) if (start_action)