zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message

[mirror_frr.git] / lib / pid_output.c

diff --git a/lib/pid_output.c b/lib/pid_output.c
index de4c2fba991e873e1d269b6b1a07e3cd152f374c..f5f7b1d17172bc822ac8ed5339c69526d9db28dd 100644 (file)
--- a/lib/pid_output.c
+++ b/lib/pid_output.c
@@ -14,10 +14,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
+ * You should have received a copy of the GNU General Public License along
+ * with this program; see the file COPYING; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <zebra.h>
@@ -25,87 +24,60 @@
 #include <log.h>
 #include "version.h"
 #include "network.h"
+#include "lib_errors.h"
 
 #define PIDFILE_MASK 0644
-#ifndef HAVE_FCNTL
 
-pid_t
-pid_output (const char *path)
+pid_t pid_output(const char *path)
 {
-  FILE *fp;
-  pid_t pid;
-  mode_t oldumask;
+       int tmp;
+       int fd;
+       pid_t pid;
+       char buf[16];
+       struct flock lock;
+       mode_t oldumask;
 
-  pid = getpid();
+       pid = getpid();
 
-  oldumask = umask(0777 & ~PIDFILE_MASK);
-  fp = fopen (path, "w");
-  if (fp != NULL) 
-    {
-      fprintf (fp, "%d\n", (int) pid);
-      fclose (fp);
-      umask(oldumask);
-      return pid;
-    }
-  /* XXX Why do we continue instead of exiting?  This seems incompatible
-     with the behavior of the fcntl version below. */
-  zlog_warn("Can't fopen pid lock file %s (%s), continuing",
-           path, safe_strerror(errno));
-  umask(oldumask);
-  return -1;
-}
-
-#else /* HAVE_FCNTL */
-
-pid_t
-pid_output (const char *path)
-{
-  int tmp;
-  int fd;
-  pid_t pid;
-  char buf[16];
-  struct flock lock;  
-  mode_t oldumask;
+       oldumask = umask(0777 & ~PIDFILE_MASK);
+       fd = open(path, O_RDWR | O_CREAT, PIDFILE_MASK);
+       if (fd < 0) {
+               flog_err_sys(EC_LIB_SYSTEM_CALL,
+                            "Can't create pid lock file %s (%s), exiting",
+                            path, safe_strerror(errno));
+               umask(oldumask);
+               exit(1);
+       } else {
+               size_t pidsize;
 
-  pid = getpid ();
+               umask(oldumask);
+               memset(&lock, 0, sizeof(lock));
 
-  oldumask = umask(0777 & ~PIDFILE_MASK);
-  fd = open (path, O_RDWR | O_CREAT, PIDFILE_MASK);
-  if (fd < 0)
-    {
-      zlog_err("Can't create pid lock file %s (%s), exiting",
-              path, safe_strerror(errno));
-      umask(oldumask);
-      exit(1);
-    }
-  else
-    {
-      size_t pidsize;
+               set_cloexec(fd);
 
-      umask(oldumask);
-      memset (&lock, 0, sizeof(lock));
+               lock.l_type = F_WRLCK;
+               lock.l_whence = SEEK_SET;
 
-      set_cloexec(fd);
+               if (fcntl(fd, F_SETLK, &lock) < 0) {
+                       flog_err_sys(EC_LIB_SYSTEM_CALL,
+                                    "Could not lock pid_file %s (%s), exiting.  Please ensure that the daemon is not already running",
+                                    path, safe_strerror(errno));
+                       exit(1);
+               }
 
-      lock.l_type = F_WRLCK;
-      lock.l_whence = SEEK_SET;
-
-      if (fcntl(fd, F_SETLK, &lock) < 0)
-        {
-          zlog_err("Could not lock pid_file %s, exiting", path);
-          exit(1);
-        }
-
-      sprintf (buf, "%d\n", (int) pid);
-      pidsize = strlen(buf);
-      if ((tmp = write (fd, buf, pidsize)) != (int)pidsize)
-        zlog_err("Could not write pid %d to pid_file %s, rc was %d: %s",
-                (int)pid,path,tmp,safe_strerror(errno));
-      else if (ftruncate(fd, pidsize) < 0)
-        zlog_err("Could not truncate pid_file %s to %u bytes: %s",
-                path,(u_int)pidsize,safe_strerror(errno));
-    }
-  return pid;
+               sprintf(buf, "%d\n", (int)pid);
+               pidsize = strlen(buf);
+               if ((tmp = write(fd, buf, pidsize)) != (int)pidsize)
+                       flog_err_sys(
+                               EC_LIB_SYSTEM_CALL,
+                               "Could not write pid %d to pid_file %s, rc was %d: %s",
+                               (int)pid, path, tmp, safe_strerror(errno));
+               else if (ftruncate(fd, pidsize) < 0)
+                       flog_err_sys(
+                               EC_LIB_SYSTEM_CALL,
+                               "Could not truncate pid_file %s to %u bytes: %s",
+                               path, (unsigned int)pidsize,
+                               safe_strerror(errno));
+       }
+       return pid;
 }
-
-#endif /* HAVE_FCNTL */