[BACK]Return to pio.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / libelwix / src

Diff for /libelwix/src/pio.c between versions 1.1.2.7 and 1.10

version 1.1.2.7, 2013/12/06 00:50:16 version 1.10, 2024/10/28 09:58:51
Line 12  terms: Line 12  terms:
 All of the documentation and software included in the ELWIX and AITNET  All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>  Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
   
Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013Copyright 2004 - 2024
         by Michael Pounov <misho@elwix.org>.  All rights reserved.          by Michael Pounov <misho@elwix.org>.  All rights reserved.
   
 Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
Line 46  SUCH DAMAGE. Line 46  SUCH DAMAGE.
 #include "global.h"  #include "global.h"
   
   
   #ifdef __linux__
   #define __USE_GNU
   
   #ifndef O_CLOEXEC
   #define O_CLOEXEC       02000000
   #endif
   #endif
   
 extern char **environ;  extern char **environ;
   
 pio_pid_t pio_pidlist = SLIST_HEAD_INITIALIZER(pio_pidlist);  pio_pid_t pio_pidlist = SLIST_HEAD_INITIALIZER(pio_pidlist);
   #ifdef HAVE_LIBPTHREAD
 static pthread_mutex_t pidlist_mutex = PTHREAD_MUTEX_INITIALIZER;  static pthread_mutex_t pidlist_mutex = PTHREAD_MUTEX_INITIALIZER;
   
#define THREAD_LOCK()   if (__isthreaded) pthread_mutex_lock(&pidlist_mutex)#define THREAD_LOCK()   pthread_mutex_lock(&pidlist_mutex)
#define THREAD_UNLOCK() if (__isthreaded) pthread_mutex_unlock(&pidlist_mutex)#define THREAD_UNLOCK() pthread_mutex_unlock(&pidlist_mutex)
 #else
 #define THREAD_LOCK()
 #define THREAD_UNLOCK()
 #endif
   
   
 /*  /*
  * e_popen() - ELWIX replacement of standard popen   * e_popen() - ELWIX replacement of standard popen
  *   *
  * @command = command   * @command = command
  * @type = type   * @type = type
  * @ppid = return pid of child program   * @ppid = return pid of child program
    *      If value of *ppid is -1 when invoke routine then child will be session leader
  * return: NULL error or !=NULL open program   * return: NULL error or !=NULL open program
  */   */
 #ifdef POPEN_STREAM  #ifdef POPEN_STREAM
Line 70  int Line 83  int
 #endif  #endif
 e_popen(const char *command, const char *type, pid_t *ppid)  e_popen(const char *command, const char *type, pid_t *ppid)
 {  {
           return e_popen2(command, type, ppid, NULL, 0);
   }
   
   /*
    * e_popen2() - ELWIX replacement of standard popen with post close of chosen handles
    *
    * @command = command
    * @type = type
    * @ppid = return pid of child program 
    *      If value of *ppid is -1 when invoke routine then child will be session leader
    * @fds = file descriptor array for close when fork
    * @fdslen = fds number of descriptors
    * return: NULL error or !=NULL open program
    */
   #ifdef POPEN_STREAM
   FILE *
   #else
   int
   #endif
   e_popen2(const char *command, const char *type, pid_t *ppid, int *fds, size_t fdslen)
   {
         struct tagPIOPID *cur, *p;          struct tagPIOPID *cur, *p;
        int pdes[2], pid, twoway, cloexec;        int pdes[2], pid, twoway, cloexec, i;
         char *argv[4];          char *argv[4];
   
         if (!command || !type)          if (!command || !type)
Line 125  e_popen(const char *command, const char *type, pid_t * Line 159  e_popen(const char *command, const char *type, pid_t *
         argv[3] = NULL;          argv[3] = NULL;
   
         THREAD_LOCK();          THREAD_LOCK();
        switch (pid = vfork()) {        switch (pid = fork()) {
         case -1:                        /* Error. */          case -1:                        /* Error. */
                 LOGERR;                  LOGERR;
                 THREAD_UNLOCK();                  THREAD_UNLOCK();
Line 139  e_popen(const char *command, const char *type, pid_t * Line 173  e_popen(const char *command, const char *type, pid_t *
 #endif  #endif
                 /* NOTREACHED */                  /* NOTREACHED */
         case 0:                         /* Child. */          case 0:                         /* Child. */
                   if (ppid && *ppid == -1)
                           setsid();
   
                   if (fds && fdslen) {
                           for (i = 0; i < fdslen; i++)
                                   close(fds[i]);
                   }
   
                 if (*type == 'r') {                  if (*type == 'r') {
                         /*                          /*
                          * The _dup2() to STDIN_FILENO is repeated to avoid                           * The _dup2() to STDIN_FILENO is repeated to avoid
Line 231  e_pclose(int iop) Line 273  e_pclose(int iop)
 #endif  #endif
 {  {
         struct tagPIOPID *cur, *last = NULL;          struct tagPIOPID *cur, *last = NULL;
        int pstat;        int pstat = 0;
         pid_t pid;          pid_t pid;
   
         if (!iop)          if (!iop)
Line 318  pio_pchkpid(array_t ** __restrict pids) Line 360  pio_pchkpid(array_t ** __restrict pids)
 {  {
         register int ret = 0;          register int ret = 0;
         struct tagPIOPID *p;          struct tagPIOPID *p;
        array_t *pa;        array_t *pa = NULL;
   
         if (pids) {          if (pids) {
                 if (!(pa = array_Init(0)))                  if (!(pa = array_Init(0)))
Removed from v.1.1.2.7  
changed lines
  Added in v.1.10

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>