- fix dhcpcd nam page for inform about writing pid file is allways performed in

  /var/run,
- more fixes for correct snprintf() output pid file name (by Przemyslaw Bialek
  <lobo@chello.pl>) in case const location in /var/run.

Changed files:
    dhcpcd-paths_fixes.patch -> 1.5

diff --git a/dhcpcd-paths_fixes.patch b/dhcpcd-paths_fixes.patch
index 1c43cfd3b6d498a0529494f31d5dafdc0fe9c498..1a0d1b80df63c816d11d33f0503c30d4ef24aaaa 100644 (file)
--- a/dhcpcd-paths_fixes.patch
+++ b/dhcpcd-paths_fixes.patch
@@ -31,3 +31,54 @@
  Default 
  .I <ConfigDir>
  directory used for storing files
+@@ -363,7 +363,7 @@
+ .B dhcpcd
+ exits for any reason.
+ .TP
+-.BI <ConfigDir>/dhcpcd-<interface>.pid
++.BI /var/run/dhcpcd-<interface>.pid
+ file containing the process id of
+ .B dhcpcd.
+ The word
+diff -ur dhcpcd-1.3.22-pl1.orig/client.c dhcpcd-1.3.22-pl1/client.c
+--- dhcpcd-1.3.22-pl1.orig/client.c    Mon Jan 21 00:46:27 2002
++++ dhcpcd-1.3.22-pl1/client.c Fri Oct 11 18:14:08 2002
+@@ -1670,7 +1670,7 @@
+ {
+   int o;
+   char pidfile[64];
+-  snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,ConfigDir,IfNameExt);
++  snprintf(pidfile,sizeof(pidfile),PID_FILE_PATH,IfNameExt);
+   o=open(pidfile,O_RDONLY);
+   if ( o == -1 ) return;
+   close(o);
+diff -ur dhcpcd-1.3.22-pl1.orig/signals.c dhcpcd-1.3.22-pl1/signals.c
+--- dhcpcd-1.3.22-pl1.orig/signals.c   Sun Jan 20 23:51:46 2002
++++ dhcpcd-1.3.22-pl1/signals.c        Fri Oct 11 18:13:21 2002
+@@ -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,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,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,IfNameExt);
+   unlink(pidfile);
+ }
+ /*****************************************************************************/