berdav/cado
1
0
Fork 0
mirror of https://github.com/rd235/cado synced 2025-03-09 15:20:13 +01:00
Code Issues Releases Wiki Activity

scado now uses execs to make possible to use complex editor commands:

Browse Source 
Like
$ EDITOR="vim -i 'startinsert'" scado -e
or
$ EDITOR="cp saved_scado_file" scado -e
This commit is contained in:
Davide Berardi 2016-08-10 14:37:46 +02:00
parent 65b997bb9c
commit db0e989ec0
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scado.c
View File

@ -19,6 +19,7 @@
*
*/
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -43,6 +44,8 @@
#include <compute_digest.h>
#include <config.h>
#include <s2argv.h>
#define EDIT_PAM_MAXTRIES 3
#define SUCCESS 0
@ -185,7 +188,7 @@ int scado_edit(char *progname, char *username, char *program_path) {
char tmp_file[PATH_MAX];
char scado_file[PATH_MAX];
char *editor;
char *argv[]={NULL, tmp_file, NULL};
char *args = NULL;
int status = 0;
pid_t pid, xpid;
char digest_before[DIGESTSTRLEN + 1];
@ -223,7 +226,6 @@ int scado_edit(char *progname, char *username, char *program_path) {
((editor = getenv("EDITOR")) == NULL || *editor == '\0')) {
editor = EDITOR;
}
argv[0] = editor;
switch (pid = fork()) {
case -1:
@ -239,7 +241,14 @@ int scado_edit(char *progname, char *username, char *program_path) {
perror("setuid(getuid())");
exit(ERROR_EXIT);
}
execvp(argv[0], argv);
asprintf(&args, "%s %s", editor, tmp_file);
if (args == NULL) {
exit(ERROR_EXIT);
}
execsp(args);
perror(editor);
exit(ERROR_EXIT);
default: