/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 plugin-runner.c

  • Committer: Teddy Hogeborn
  • Date: 2020-02-06 15:56:51 UTC
  • Revision ID: teddy@recompile.se-20200206155651-kx7r39zj8hpv8udl
Use collections.abc.Callable instead of collections.Callable

In Python 3.7, collections.Callable (among others) was moved to
collections.abc.Callable, and its old location deprecated.

* mandos: Create "collections.abc.Callable" if it does not exist, and
  only use the new name.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin-runner.c
313
313
__attribute__((nonnull))
314
314
static void free_plugin(plugin *plugin_node){
315
315
  
 
316
  for(char **arg = (plugin_node->argv)+1; *arg != NULL; arg++){
 
317
    free(*arg);
 
318
  }
316
319
  free(plugin_node->name);
317
 
  for(char **arg = plugin_node->argv; *arg != NULL; arg++){
318
 
    free(*arg);
319
 
  }
320
320
  free(plugin_node->argv);
321
321
  for(char **env = plugin_node->environ; *env != NULL; env++){
322
322
    free(*env);
565
565
    case '?':                   /* --help */
566
566
      state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
567
567
      argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
 
568
      __builtin_unreachable();
568
569
    case -3:                    /* --usage */
569
570
      state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
570
571
      argp_state_help(state, state->out_stream,
571
572
                      ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
 
573
      __builtin_unreachable();
572
574
    case 'V':                   /* --version */
573
575
      fprintf(state->out_stream, "%s\n", argp_program_version);
574
576
      exit(EXIT_SUCCESS);
584
586
      if(arg[0] == '\0'){
585
587
        break;
586
588
      }
 
589
#if __GNUC__ >= 7
 
590
      __attribute__((fallthrough));
 
591
#else
 
592
          /* FALLTHROUGH */
 
593
#endif
587
594
    default:
588
595
      return ARGP_ERR_UNKNOWN;
589
596
    }
1093
1100
    
1094
1101
    new_plugin->pid = pid;
1095
1102
    new_plugin->fd = pipefd[0];
1096
 
    
 
1103
 
 
1104
    if(debug){
 
1105
      fprintf(stderr, "Plugin %s started (PID %" PRIdMAX ")\n",
 
1106
              new_plugin->name, (intmax_t) (new_plugin->pid));
 
1107
    }
 
1108
 
1097
1109
    /* Unblock SIGCHLD so signal handler can be run if this process
1098
1110
       has already completed */
1099
1111
    ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,