Let's try this again...

[tpg/opendispense2.git] / src / server / handler_door.c

diff --git a/src/server/handler_door.c b/src/server/handler_door.c
index 9942526..1f959fd 100644 (file)
--- a/src/server/handler_door.c
+++ b/src/server/handler_door.c
@@ -7,14 +7,19 @@
  * This file is licenced under the 3-clause BSD Licence. See the file
  * COPYING for full details.
  */
+#define        DEBUG   1
+#define        USE_POPEN       0
+
 #include "common.h"
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-
-#define        DEBUG   1
+#include <signal.h>
+#if !USE_POPEN
+# include <unistd.h>
+#endif
 
 #define DOOR_UNLOCKED_DELAY    10      // 10 seconds before it re-locks
 
@@ -33,7 +38,6 @@ tHandler      gDoor_Handler = {
        Door_DoDispense
 };
 char   *gsDoor_Password = "";
-// int giDoor_SerialFD;
 
 // == CODE ===
 int Door_InitHandler(void)
@@ -71,8 +75,11 @@ int Door_CanDispense(int User, int Item)
  */
 int Door_DoDispense(int User, int Item)
 {
-       FILE    *pipe;
-       char    buf[512];       // Buffer flush location - the sewer :)
+       FILE    *child_stdin;
+       char    buf[512];
+        int    stdin_pair[2];
+        int    stdout_pair[2];
+       pid_t   childPid;
        
        #if DEBUG
        printf("Door_DoDispense: (User=%i,Item=%i)\n", User, Item);
@@ -90,33 +97,86 @@ int Door_DoDispense(int User, int Item)
                return 1;
        }
        
-       // llogin or other
-       pipe = popen("llogin door -w -", "w");
-       if( !pipe || pipe == (void*)-1 ) {
+       // Create stdin/stdout
+       if( pipe(stdin_pair) || pipe(stdout_pair) )
+       {
+               perror("pipe");
+               return -1;
+       }
+       
+       childPid = fork();
+       
+       if( childPid < 0 )
+       {
+               perror("fork");
+               return -1;
+       }
+       
+       // Child process
+       if( childPid == 0 )
+       {
+               // Close write end of stdin, and set it to #0
+               close(stdin_pair[1]);   dup2(stdin_pair[0], 0);
+               // Close read end of stdout, and set it to #1
+               close(stdout_pair[0]);  dup2(stdout_pair[1], 1);
+               
+               execl("/bin/sh", "sh", "-c", "llogin door -w-", NULL);
+               perror("execl");
+               exit(-1);
+       }
+       
+       child_stdin = fdopen(stdin_pair[1], "w");
+       close(stdin_pair[0]);   // child stdin read
+       close(stdout_pair[1]);  // child stdout write
+       
+       if(read(stdout_pair[1], buf, 512) < 0) {
                #if DEBUG
-               printf("Door_DoDispense: llogin failure\n");
+               printf("Door_DoDispense: fread fail\n");
                #endif
                return -1;
        }
-       if( fread(buf, 512, 1, pipe) == 0 )     return -1;      // Flush!
        
        // Send password
-       fputs(gsDoor_Password, pipe);
-       fputs("\n", pipe);
-       if( fread(buf, 512, 1, pipe) == 0 )     return -1;      // Flush!
+       if( fputs(gsDoor_Password, child_stdin) <= 0 ) {
+               #if DEBUG
+               printf("Door_DoDispense: fputs password\n");
+               #endif
+               return -1;
+       }
+       fputs("\n", child_stdin);
+       
+       
+       #if DEBUG
+       printf("Door_DoDispense: Door unlock\n");
+       #endif
        
        // ATH1 - Unlock door
-       fputs("ATH1\n", pipe);
-       if( fread(buf, 512, 1, pipe) == 0 )     return -1;      // Flush!
+       if( fputs("ATH1\n", child_stdin) <= 0) {
+               #if DEBUG
+               printf("Door_DoDispense: fputs unlock\n");
+               #endif
+               return -1;
+       }
        
        // Wait before re-locking
        sleep(DOOR_UNLOCKED_DELAY);
 
+
+       #if DEBUG
+       printf("Door_DoDispense: Door re-lock\n");
+       #endif
+
        // Re-lock the door
-       fputs("ATH0\n", pipe);
-       if( fread(buf, 512, 1, pipe) == 0 )     return -1;      // Flush!
+       if( fputs("ATH0\n", child_stdin) <= 0 ) {
+               #if DEBUG
+               printf("Door_DoDispense: fputs lock\n");
+               #endif
+               return -1;
+       }
        
-       pclose(pipe);
+       fclose(child_stdin);
+       close(stdin_pair[1]);   // child stdin write
+       close(stdout_pair[0]);  // child stdout read
        
        #if DEBUG
        printf("Door_DoDispense: User %i opened door\n", User);
@@ -125,4 +185,3 @@ int Door_DoDispense(int User, int Item)
        return 0;
 }
 
-