/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to plugins.d/splashy.c

  • Committer: Teddy Hogeborn
  • Date: 2009-02-05 03:15:43 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090205031543-cyd3j09i6iut38w1
* plugin-runner.c (struct plugin.status): Changed type to "int".
  (main): Check "proc->completed" before "proc->eof", since
          "completed" is of type "sig_atomic_t".

Show diffs side-by-side

added added

removed removed

Lines of Context:
30
30
                                   SIG_IGN, kill(), SIGKILL */
31
31
#include <stddef.h>             /* NULL */
32
32
#include <stdlib.h>             /* getenv() */
33
 
#include <stdio.h>              /* asprintf(), perror() */
 
33
#include <stdio.h>              /* asprintf(), perror(), sscanf() */
34
34
#include <stdlib.h>             /* EXIT_FAILURE, free(),
35
35
                                   EXIT_SUCCESS */
36
36
#include <sys/types.h>          /* pid_t, DIR, struct dirent,
37
37
                                   ssize_t */
38
38
#include <dirent.h>             /* opendir(), readdir(), closedir() */
39
 
#include <inttypes.h>           /* intmax_t, strtoimax() */
 
39
#include <inttypes.h>           /* intmax_t, SCNdMAX */
40
40
#include <sys/stat.h>           /* struct stat, lstat(), S_ISLNK */
41
41
#include <iso646.h>             /* not, or, and */
42
42
#include <unistd.h>             /* readlink(), fork(), execl(),
101
101
      pid_t pid;
102
102
      {
103
103
        intmax_t tmpmax;
104
 
        char *tmp;
105
 
        errno = 0;
106
 
        tmpmax = strtoimax(proc_ent->d_name, &tmp, 10);
107
 
        if(errno != 0 or tmp == proc_ent->d_name or *tmp != '\0'
108
 
           or tmpmax != (pid_t)tmpmax){
 
104
        int numchars;
 
105
        ret = sscanf(proc_ent->d_name, "%" SCNdMAX "%n", &tmpmax,
 
106
                     &numchars);
 
107
        if(ret < 1 or tmpmax != (pid_t)tmpmax
 
108
           or proc_ent->d_name[numchars] != '\0'){
109
109
          /* Not a process */
110
110
          continue;
111
111
        }