54 lines
1.9 KiB
Diff
54 lines
1.9 KiB
Diff
diff -ru dhcpcd-1.3.22-pl4/dhcpcd.c dhcpcd-1.3.22-pl4-new/dhcpcd.c
|
|
--- dhcpcd-1.3.22-pl4/dhcpcd.c 2003-01-01 02:26:32.000000000 +0100
|
|
+++ dhcpcd-1.3.22-pl4-new/dhcpcd.c 2003-01-12 22:06:34.000000000 +0100
|
|
@@ -88,7 +88,7 @@
|
|
{
|
|
int o;
|
|
char pidfile[64];
|
|
- snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,ConfigDir,IfNameExt);
|
|
+ snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,PID_DIR,IfNameExt);
|
|
o=open(pidfile,O_RDONLY);
|
|
if ( o == -1 ) return;
|
|
close(o);
|
|
diff -ru dhcpcd-1.3.22-pl4/pathnames.h dhcpcd-1.3.22-pl4-new/pathnames.h
|
|
--- dhcpcd-1.3.22-pl4/pathnames.h 2002-09-29 17:55:31.000000000 +0200
|
|
+++ dhcpcd-1.3.22-pl4-new/pathnames.h 2003-01-12 22:05:40.000000000 +0100
|
|
@@ -37,6 +37,7 @@
|
|
#define NIS_CONF "/etc/config/yp.conf"
|
|
#define NTP_CONF "/etc/config/ntp.conf"
|
|
#else
|
|
+#define PID_DIR "/var/run"
|
|
#define CONFIG_DIR "/etc/dhcpc"
|
|
#define RESOLV_CONF "/etc/resolv.conf"
|
|
#define NIS_CONF "/etc/yp.conf"
|
|
diff -ru dhcpcd-1.3.22-pl4/signals.c dhcpcd-1.3.22-pl4-new/signals.c
|
|
--- dhcpcd-1.3.22-pl4/signals.c 2002-01-20 23:51:46.000000000 +0100
|
|
+++ dhcpcd-1.3.22-pl4-new/signals.c 2003-01-12 22:07:10.000000000 +0100
|
|
@@ -44,7 +44,7 @@
|
|
FILE *fp;
|
|
pid_t pid;
|
|
char pidfile[64];
|
|
- snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,ConfigDir,IfNameExt);
|
|
+ snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,PID_DIR,IfNameExt);
|
|
fp=fopen(pidfile,"r");
|
|
if ( fp == NULL ) goto ntrn;
|
|
fscanf(fp,"%u",&pid);
|
|
@@ -63,7 +63,7 @@
|
|
{
|
|
FILE *fp;
|
|
char pidfile[64];
|
|
- snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,ConfigDir,IfNameExt);
|
|
+ snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,PID_DIR,IfNameExt);
|
|
fp=fopen(pidfile,"w");
|
|
if ( fp == NULL )
|
|
{
|
|
@@ -77,7 +77,7 @@
|
|
void deletePidFile()
|
|
{
|
|
char pidfile[64];
|
|
- snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,ConfigDir,IfNameExt);
|
|
+ snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,PID_DIR,IfNameExt);
|
|
unlink(pidfile);
|
|
}
|
|
/*****************************************************************************/
|