Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / lib / pid_output.c

diff --git a/lib/pid_output.c b/lib/pid_output.c
index b0643c4fe289c463207879c497714cb12ff477ef..064a7bb47fbb6071dee4e1a43d80e3b8af037663 100644 (file)
--- a/lib/pid_output.c
+++ b/lib/pid_output.c
@@ -1,28 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Process id output.
  * Copyright (C) 1998, 1999 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * 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 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>
 #include <fcntl.h>
 #include <log.h>
-#include "version.h"
+#include "lib/version.h"
 #include "network.h"
 #include "lib_errors.h"
 
@@ -60,12 +45,12 @@ pid_t pid_output(const char *path)
 
                if (fcntl(fd, F_SETLK, &lock) < 0) {
                        flog_err_sys(EC_LIB_SYSTEM_CALL,
-                                    "Could not lock pid_file %s (%s), exiting",
+                                    "Could not lock pid_file %s (%s), exiting.  Please ensure that the daemon is not already running",
                                     path, safe_strerror(errno));
                        exit(1);
                }
 
-               sprintf(buf, "%d\n", (int)pid);
+               snprintf(buf, sizeof(buf), "%d\n", (int)pid);
                pidsize = strlen(buf);
                if ((tmp = write(fd, buf, pidsize)) != (int)pidsize)
                        flog_err_sys(