version 0.26 More robust code (maybe)

Author: Arondight

Changes

@@ -1,3 +1,6 @@
+v0.26   2016-05-19
+  * More robust code (maybe)
+
 v0.25   2016-02-24
   * More accurate local device identification
 

TODO

@@ -3,28 +3,31 @@
 # This to build project
 # ==============================================================================
 
-curdir=$(dirname $(readlink -f $0))
-builddir=$curdir/build
+RDIR=$(dirname $(readlink -f $0))
+BUILDDIR=${RDIR}/build
 
-function build {
-  mkdir -p $builddir  \
-    && cd $builddir \
+function build ()
+{
+  mkdir -p $BUILDDIR  \
+    && cd $BUILDDIR \
     && cmake -DCMAKE_BUILD_TYPE=Release ..  \
-    && make -j4
+    && cmake --build . --config Release -- -j4
 
   return $?
 }
 
-function install {
-  cd $builddir  \
+function install ()
+{
+  cd $BUILDDIR  \
     && sudo make install -j4
 
   return $?
 }
 
 build
 
-if [[ 0 -eq $? && 'install' == $1 ]]; then
+if [[ 0 -eq $? && 'install' == $1 ]]
+then
   install
 fi
 

build.sh

@@ -0,0 +1,5 @@
+pub   rsa4096/B66CC194 2016-04-15 [SC]
+      Key fingerprint = 4444 9495 01B3 CC2A 7657  9C08 25FF D92A B66C C194
+uid         [ultimate] Arondight <shell_way@foxmail.com>
+sub   rsa4096/F96E3CB7 2016-04-15 [E]
+

fingerprint

@@ -3,5 +3,14 @@
 # This to build project and do install
 # ==============================================================================
 
-source ./build.sh install
+RDIR=$(dirname $(readlink -f $0))
+BUILD_SH="${RDIR}/build.sh"
+BUILD_ARGS="install"
+
+if [[ -x $BUILD_SH ]]
+then
+  command $BUILD_SH $BUILD_ARGS
+fi
+
+exit $?
 

install.sh

@@ -0,0 +1,40 @@
+/* ========================================================================== *
+ * Copyright (c) 2015-2016 秦凡东(Qin Fandong)
+ *
+ * This program 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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.  If not, see <http://www.gnu.org/licenses/>.
+ * ========================================================================== *
+ * Do assert
+ * ========================================================================== */
+#ifndef __ASSERT_H__
+#define __ASSERT_H__
+
+#include <libgen.h>
+#include "say.h"
+
+#define LOG(m,t,f,...)   \
+  ((say ((m), (t), "ASSERT FAILED in %4d of %s:\t(%s) - ",  \
+                      __LINE__, basename (__FILE__), __FUNCTION__)),  \
+  (say ((m), (t), (f), ##__VA_ARGS__)))
+
+#define ASSERT_ABORT(e,s) \
+ ((e) ? (void)0 : ((LOG (mode, MSG_E, (s))), abort ()))
+
+#define ASSERT_LOG(e,s) \
+ ((e) ? (void)0 : ((LOG (mode, MSG_E, (s)))))
+
+#define ASSERT_RETURN(e,s,r)  \
+  { if (!(e)) { LOG (mode, MSG_E, (s)); return (r); } }
+
+#endif
+

src/assert.h

@@ -17,16 +17,17 @@
  * Delete all of '\n' at end of string
  * ========================================================================== */
 #include <string.h>
+#include "assert.h"
 
 int
 chomp (char * const string)
 {
-  int index;
+  int index = 0;
+  saymode_t mode = MODE_UNKNOWN;
 
-  if (!string)
-    {
-      return -1;
-    }
+  sayMode (&mode);
+
+  ASSERT_RETURN (string, "string is NULL.\n", -1);
 
   for (index = strlen (string) - 1; index > -1; --index)
     {

src/chomp.c

@@ -26,6 +26,7 @@
 #include <syslog.h>
 #include <sys/stat.h>
 #include <sys/resource.h>
+#include "assert.h"
 
 enum {
   STATUS_OK = 1,
@@ -35,17 +36,16 @@ enum {
 /* ========================================================================== *
  * Set mask to 0, let a new file may has any privilege
  * ========================================================================== */
-int
+static int
 setMask (void)
 {
-  umask (0);
-  return STATUS_OK;
+  return umask (0) ? STATUS_ERROR : STATUS_OK;
 }
 
 /* ========================================================================== *
  * Change work directory to root
  * ========================================================================== */
-int
+static int
 chrootdir (void)
 {
   const char * const rootdir = "/";
@@ -62,10 +62,10 @@ chrootdir (void)
 /* ========================================================================== *
  * Create a new session
  * ========================================================================== */
-int
+static int
 newSession (void)
 {
-  pid_t pid;
+  pid_t pid = 0;
 
   if ((pid = fork ()) < 0)
     {
@@ -90,11 +90,13 @@ newSession (void)
 /* ========================================================================== *
  * Disable controlling terminal
  * ========================================================================== */
-int
+static int
 noTTY (void)
 {
-  struct sigaction action;
-  pid_t pid;
+  struct sigaction action = { 0 };
+  pid_t pid = 0;
+
+  memset (&action, 0, sizeof (struct sigaction));
 
   action.sa_handler = SIG_IGN;
   sigemptyset (&action.sa_mask);
@@ -123,18 +125,20 @@ noTTY (void)
 /* ========================================================================== *
  * Close all file descriptor
  * ========================================================================== */
-int
+static int
 closeFD (void)
 {
-  struct rlimit limit;
+  struct rlimit limit = { 0 };
+  int fd = 0;
+
+  memset (&limit, 0, sizeof (struct rlimit));
 
   if (getrlimit (RLIMIT_NOFILE, &limit) < 0)
     {
       perror ("getrlimit falied:");
       return STATUS_ERROR;
     }
 
-  int fd = 0;
   while (fd < (int)(RLIM_INFINITY == limit.rlim_max ? 1024 : limit.rlim_max))
     {
       close (fd++);
@@ -147,11 +151,11 @@ closeFD (void)
  * Reopen stdin, stdout and stderr to /dev/null
  * Invoke this after closeFD
  * ========================================================================== */
-int
+static int
 reopen (void)
 {
   const char * const nullFile = "/dev/null";
-  int in, out, err;
+  int in = 0, out = 0, err = 0;
 
   in = open (nullFile, O_RDWR);
   out = dup (in);
@@ -169,7 +173,7 @@ reopen (void)
 /* ========================================================================== *
  * Init log
  * ========================================================================== */
-int
+static int
 initLog (const char * const ident)
 {
   openlog (ident, LOG_CONS, LOG_DAEMON);
@@ -185,6 +189,8 @@ daemonize (const char * const ident)
 {
   int status = 0;
 
+  /* Also work well when ident is NULL so here no need to check */
+
   status |= setMask ();
   status |= newSession ();
   status |= noTTY ();

src/daemonize.c

@@ -30,6 +30,7 @@
 #include "say.h"
 #include "find.h"
 #include "readfile.h"
+#include "assert.h"
 #include "config.h"
 
 static char **list = NULL;
@@ -38,21 +39,23 @@ static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 /* ========================================================================== *
  * Return loacl devices
  * ========================================================================== */
-int
+static int
 localDevs (void)
 {
   char **text = NULL;
   char *pos = NULL;
-  char path[MAXPATHLEN + 1], buff[MAXPATHLEN + 1];
-  saymode_t mode;
-  int uuid2path, label2path;
-  int index, index2;
-  int no;
-  int len;
-  int chr;
+  char path[MAXPATHLEN + 1] = { 0 }, buff[MAXPATHLEN + 1] = { 0 };
+  saymode_t mode = MODE_UNKNOWN;
+  int uuid2path = 0, label2path = 0;
+  int index = 0, index2 = 0;
+  int no = 0;
+  int len = 0;
+  int chr = 0;
   const char uuidInterface[] = "/dev/disk/by-uuid";
   const char labelInterface[] = "/dev/disk/by-label";
 
+  memset (path, 0, sizeof (path));
+  memset (buff, 0, sizeof (buff));
   sayMode (&mode);
 
   if (list)
@@ -181,17 +184,20 @@ localDevs (void)
 /* ========================================================================== *
  * Determine whether a devPath is a local device
  * ========================================================================== */
-int
+static int
 isLocalDev (const char * const devPath)
 {
-  char *pattern;
-  char buff[MAXPATHLEN + 1];
-  saymode_t mode;
-  int index;
-  int status;
+  char *pattern = NULL;
+  char buff[MAXPATHLEN + 1] = { 0 };
+  saymode_t mode = MODE_UNKNOWN;
+  int index = 0;
+  int status = 0;
 
+  memset (buff, 0, sizeof (buff));
   sayMode (&mode);
 
+  ASSERT_RETURN (devPath, "devPath is NULL.\n", -1);
+
   strncpy (buff, devPath, MAXPATHLEN);
   pattern = basename (buff);
 
@@ -204,16 +210,6 @@ isLocalDev (const char * const devPath)
         }
     }
 
-  /* TODO: Use a faster way to search FSTAB { *
-  if (-1 == (status = find (FSTAB, pattern)))
-    {
-      say (mode, MSG_E, "find failed\n");
-      return -1;
-    }
-
-  return status;
-  * } */
-
   localDevs ();
 
   status = 0;
@@ -233,17 +229,21 @@ isLocalDev (const char * const devPath)
 int
 devs (char ***addr)
 {
-  DIR *dh;
-  struct dirent *dir;
-  char **uuids;
-  char buff[MAXPATHLEN + 1], dev[MAXPATHLEN + 1];
-  size_t len;
-  saymode_t mode;
-  int no, count;
+  DIR *dh = NULL;
+  struct dirent *dir = NULL;
+  char **uuids = NULL;
+  char buff[MAXPATHLEN + 1] = { 0 }, dev[MAXPATHLEN + 1] = { 0 };
+  size_t len = 0;
+  saymode_t mode = 0;
+  int no = 0, count = 0;
   const char interface[] = "/dev/disk/by-uuid";
 
+  memset (buff, 0, sizeof (buff));
+  memset (dev, 0, sizeof (dev));
   sayMode (&mode);
 
+  ASSERT_RETURN (addr, "addr is NULL.\n", -1);
+
   if (!(dh = opendir (interface)))
     {
       say (mode, MSG_E, "opendir failed: %s\n", strerror (errno));