#include <sys/stat.h>
#include <fcntl.h>
#include <signal.h>
-#if !USE_POPEN
-# include <unistd.h>
-#endif
+#include <unistd.h>
+#include <sys/wait.h>
#define DOOR_UNLOCKED_DELAY 10 // 10 seconds before it re-locks
int Door_InitHandler();
int Door_CanDispense(int User, int Item);
int Door_DoDispense(int User, int Item);
-void Door_int_SIGCHLDHandler(int signum);
// === GLOBALS ===
tHandler gDoor_Handler = {
Door_DoDispense
};
char *gsDoor_Password = "";
-volatile int giDoor_ChildTerminated;
+volatile int giDoor_ChildStatus;
// == CODE ===
+void Door_SIGCHLDHandler(int signum)
+{
+ signum = 0;
+ giDoor_ChildStatus ++;
+ printf("SIGCHLD: giDoor_ChildStatus = %i \n", giDoor_ChildStatus);
+}
+
int Door_InitHandler(void)
-{
- signal(SIGCHLD, Door_int_SIGCHLDHandler);
+{
+ signal(SIGCHLD, Door_SIGCHLDHandler);
return 0;
}
{
FILE *child_stdin;
char buf[512];
- #if !USE_POPEN
int stdin_pair[2];
int stdout_pair[2];
pid_t childPid;
- pid_t parent_pid;
- #endif
+ pid_t parentPid;
#if DEBUG
printf("Door_DoDispense: (User=%i,Item=%i)\n", User, Item);
return 1;
}
- #if !USE_POPEN
// Create stdin/stdout
if( pipe(stdin_pair) || pipe(stdout_pair) )
{
return -1;
}
- parent_pid = getpid();
+ giDoor_ChildStatus = 0; // Set child status to zero
+ parentPid = getpid();
childPid = fork();
if( childPid < 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);
- kill(parent_pid, SIGCHLD);
+ //execl("/bin/sh", "sh", "-c", "llogin door -w-", NULL);
+ execl("/usr/bin/llogin", "llogin" "door" "-w-", NULL);
perror("execl");
exit(-1);
}
close(stdin_pair[0]); // child stdin read
close(stdout_pair[1]); // child stdout write
- #else
- // llogin or other
- child_stdin = popen("llogin door -w -", "w");
- if( !child_stdin || child_stdin == (void*)-1 ) {
+ {
+ int len;
+ if( giDoor_ChildStatus || (len = read(stdout_pair[0], buf, 512)) < 0)
+ {
+ #if DEBUG
+ int child_exit;
+ waitpid(childPid, &child_exit, 0);
+ printf("Door_DoDispense: fread fail (child status %i)\n", child_exit);
+ #endif
+ return -1;
+ }
+ buf[len] = '\0';
+
#if DEBUG
- printf("Door_DoDispense: llogin failure\n");
+ printf("Door_DoDispense: buf = %i '%s'\n", len, buf);
#endif
- return -1;
}
- #endif
-
- if(fread(buf, 1, 512, child_stdin) == 0) return -1;
// Send password
- if( fputs(gsDoor_Password, child_stdin) <= 0 ) return -1;
+ if( giDoor_ChildStatus || fputs(gsDoor_Password, child_stdin) <= 0 ) {
+ #if DEBUG
+ int child_exit;
+ waitpid(childPid, &child_exit, 0);
+ printf("Door_DoDispense: fputs password fail (child status %i)\n", child_exit);
+ #endif
+ return -1;
+ }
fputs("\n", child_stdin);
#endif
// ATH1 - Unlock door
- if( fputs("ATH1\n", child_stdin) <= 0) return -1;
+ if( giDoor_ChildStatus || 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);
printf("Door_DoDispense: Door re-lock\n");
#endif
- // Re-lock the door
- if( fputs("ATH0\n", child_stdin) <= 0 ) return -1;
+ // Re-lock the door (and quit llogin)
+ if( giDoor_ChildStatus || fputs("ATH0\n\x1D", child_stdin) == 0 ) {
+ #if DEBUG
+ printf("Door_DoDispense: fputs lock\n");
+ #endif
+ return -1;
+ }
- #if !USE_POPEN
fclose(child_stdin);
close(stdin_pair[1]); // child stdin write
close(stdout_pair[0]); // child stdout read
- #else
- pclose(child_stdin);
- #endif
#if DEBUG
printf("Door_DoDispense: User %i opened door\n", User);
#endif
- return 0;
-}
+ kill(childPid, SIGKILL);
-void Door_int_SIGCHLDHandler(int signum)
-{
- signum = 0; // Snut up
- giDoor_ChildTerminated = 1;
+ return 0;
}