/mandos/release

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

« back to all changes in this revision

Viewing changes to plugin-runner.c

  • Committer: Teddy Hogeborn
  • Date: 2018-01-29 19:43:17 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 362.
  • Revision ID: teddy@recompile.se-20180129194317-07fz89jdxefuphq1
Use "simply expanded" variables in Makefile

* (Makefile): Use "simply expanded" variables where possible.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin-runner.c
2
2
/*
3
3
 * Mandos plugin runner - Run Mandos plugins
4
4
 *
5
 
 * Copyright © 2008-2018 Teddy Hogeborn
6
 
 * Copyright © 2008-2018 Björn Påhlsson
 
5
 * Copyright © 2008-2017 Teddy Hogeborn
 
6
 * Copyright © 2008-2017 Björn Påhlsson
7
7
 * 
8
8
 * This file is part of Mandos.
9
9
 * 
313
313
__attribute__((nonnull))
314
314
static void free_plugin(plugin *plugin_node){
315
315
  
 
316
  free(plugin_node->name);
316
317
  for(char **arg = plugin_node->argv; *arg != NULL; arg++){
317
318
    free(*arg);
318
319
  }
564
565
    case '?':                   /* --help */
565
566
      state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
566
567
      argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
567
 
      __builtin_unreachable();
568
568
    case -3:                    /* --usage */
569
569
      state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
570
570
      argp_state_help(state, state->out_stream,
571
571
                      ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
572
 
      __builtin_unreachable();
573
572
    case 'V':                   /* --version */
574
573
      fprintf(state->out_stream, "%s\n", argp_program_version);
575
574
      exit(EXIT_SUCCESS);
585
584
      if(arg[0] == '\0'){
586
585
        break;
587
586
      }
588
 
      /* FALLTHROUGH */
589
587
    default:
590
588
      return ARGP_ERR_UNKNOWN;
591
589
    }
1095
1093
    
1096
1094
    new_plugin->pid = pid;
1097
1095
    new_plugin->fd = pipefd[0];
1098
 
 
1099
 
    if(debug){
1100
 
      fprintf(stderr, "Plugin %s started (PID %" PRIdMAX ")\n",
1101
 
              new_plugin->name, (intmax_t) (new_plugin->pid));
1102
 
    }
1103
 
 
 
1096
    
1104
1097
    /* Unblock SIGCHLD so signal handler can be run if this process
1105
1098
       has already completed */
1106
1099
    ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,