H1K0-dev/tanabata
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(cli): fix config and path problems

Browse Source
This commit is contained in:
Masahiko AMANO 2022-12-25 12:19:00 +03:00
parent bb54c2c919
commit 72c0fa001f
1 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/cli.c
View File

@ -1,6 +1,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <getopt.h> #include <getopt.h>
#include <string.h> #include <string.h>
#include <unistd.h>
#include <libgen.h>
#include "../include/tanabata.h" #include "../include/tanabata.h"
#include "../include/cli.h" #include "../include/cli.h"
@ -246,8 +248,19 @@ int cli(int argc, char **argv) {
fprintf(stderr, ERROR("No options provided\n")); fprintf(stderr, ERROR("No options provided\n"));
return 1; return 1;
} }
char *exe_dir = malloc(4096);
memset(exe_dir, 0, 4096);
if (readlink("/proc/self/exe", exe_dir, 4096) == -1) {
fprintf(stderr, ERROR("Failed to get executable directory\n"));
return 1;
}
exe_dir = dirname(exe_dir);
char *config_path = malloc(strlen(exe_dir) + 12);
strcpy(config_path, exe_dir);
strcat(config_path, "/tfm-config");
const char *shortopts = "hI:O:suaftkwV"; const char *shortopts = "hI:O:suaftkwV";
int status = 0; int status = 0;
char *abspath = NULL;
int opt; int opt;
_Bool opt_a = 0; _Bool opt_a = 0;
_Bool opt_s = 0; _Bool opt_s = 0;
@ -281,11 +294,20 @@ int cli(int argc, char **argv) {
printf("0.1.0-dev\n"); printf("0.1.0-dev\n");
return 0; return 0;
case 'I': case 'I':
abspath = realpath(optarg, abspath);
if (abspath == NULL) {
fprintf(stderr, ERROR("Invalid path\n"));
return 1;
}
status |= tanabata_init(&tanabata); status |= tanabata_init(&tanabata);
status |= tanabata_dump(&tanabata, optarg); status |= tanabata_dump(&tanabata, abspath);
if (status == 0) { if (status == 0) {
FILE *config = fopen("./config", "w"); FILE *config = fopen(config_path, "w");
fputs(optarg, config); if (config == NULL) {
fprintf(stderr, ERROR("Failed to write to config file\n"));
return 1;
}
fputs(abspath, config);
fclose(config); fclose(config);
printf("Successfully initialized Tanabata database\n"); printf("Successfully initialized Tanabata database\n");
return 0; return 0;
@ -293,9 +315,18 @@ int cli(int argc, char **argv) {
fprintf(stderr, ERROR("Failed to initialize Tanabata database\n")); fprintf(stderr, ERROR("Failed to initialize Tanabata database\n"));
return 1; return 1;
case 'O': case 'O':
if (tanabata_open(&tanabata, optarg) == 0) { abspath = realpath(optarg, abspath);
FILE *config = fopen("./config", "w"); if (abspath == NULL) {
fputs(optarg, config); fprintf(stderr, ERROR("Invalid path\n"));
return 1;
}
if (tanabata_open(&tanabata, abspath) == 0) {
FILE *config = fopen(config_path, "w");
if (config == NULL) {
fprintf(stderr, ERROR("Failed to write to config file\n"));
return 1;
}
fputs(abspath, config);
fclose(config); fclose(config);
printf("Successfully opened Tanabata database\n"); printf("Successfully opened Tanabata database\n");
return 0; return 0;
@ -333,7 +364,7 @@ int cli(int argc, char **argv) {
opt_s = 0; opt_s = 0;
opt_u = 0; opt_u = 0;
} }
FILE *config = fopen("./tfm-config", "r"); FILE *config = fopen(config_path, "r");
if (config == NULL) { if (config == NULL) {
fprintf(stderr, ERROR("Config file not found\n")); fprintf(stderr, ERROR("Config file not found\n"));
return 1; return 1;