1 files changed, 44 insertions, 2 deletions

diff --git a/src/iiid.cc b/src/iiid.cc
index b3dd3bf..bd65001 100644
--- a/src/iiid.cc
+++ b/src/iiid.cc
@@ -21,2 +21,3 @@ int main(int argc,char **argv) try {
     int port = 59278;
+    bool daemon_mode = false;
 
@@ -29,5 +30,6 @@ int main(int argc,char **argv) try {
             { "port", required_argument, 0, 'p' },
+            { "daemon", no_argument, 0, 'd' },
             { NULL, 0, 0, 0 }
         };
-        int c = getopt_long(argc,argv,"hVLp:",opts,NULL);
+        int c = getopt_long(argc,argv,"hVLp:d",opts,NULL);
         if(c==-1) break;
@@ -44,2 +46,3 @@ int main(int argc,char **argv) try {
                     "           (you're not likely to ever need it)\n"
+                    " -d, --daemon               run as daemon\n"
                     << std::endl << std::endl;
@@ -63,2 +66,5 @@ int main(int argc,char **argv) try {
                 break;
+                case 'd':
+                daemon_mode = true;
+                break;
             default:
@@ -76,3 +82,3 @@ int main(int argc,char **argv) try {
     openlog(ident,LOG_PERROR|LOG_PID,LOG_DAEMON);
-    syslog(LOG_INFO,"Starting iii eye-fi manager");
+    syslog(LOG_INFO,"Starting iii eye-fi manager on port %d", port);
 
@@ -87,2 +93,38 @@ int main(int argc,char **argv) try {
 
+                if(daemon_mode){
+        pid_t pid, sid;
+        
+        /* Fork off the parent process */
+        pid = fork();
+        if (pid < 0) {
+                exit(EXIT_FAILURE);
+        }
+        /* If we got a good PID, then
+           we can exit the parent process. */
+        if (pid > 0) {
+                exit(EXIT_SUCCESS);
+        }
+
+        /* Change the file mode mask */
+        umask(0);       
+        
+        /* Create a new SID for the child process */
+        sid = setsid();
+        if (sid < 0) {
+                        syslog(LOG_ERR, "Error creating a new SID for the child process");
+                        exit(EXIT_FAILURE);
+        }
+        
+        /* Change the current working directory */
+        if ((chdir("/")) < 0) {
+                        syslog(LOG_ERR, "Error changing current working directory to /");
+            exit(EXIT_FAILURE);
+        }
+        
+        /* Close out the standard file descriptors */
+        close(STDIN_FILENO);
+        close(STDOUT_FILENO);
+                close(STDERR_FILENO);   
+        }
+
     eyefiworker().run(port);