Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-03-01 18:57:20 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Use r_file_new in rvc.c (#19346)

Browse Source
This commit is contained in:
RHL120 2021-11-01 08:44:49 +01:00 committed by GitHub
parent 03322e7614
commit 3247b917e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
libr/core/rvc.c
View File

@ -54,8 +54,7 @@ bool file_copyrf(const char *src, const char *dst) {
r_list_foreach (fl, iter, path) { r_list_foreach (fl, iter, path) {
//strlen(src) should always be less than strlen(path) so //strlen(src) should always be less than strlen(path) so
//I think this is ok?? //I think this is ok??
char *dstp = r_str_newf ("%s" R_SYS_DIR "%s", dst, char *dstp = r_file_new (dst, path + strlen (src), NULL);
path + strlen (src));
if (dstp) { if (dstp) {
if (r_file_is_directory (path)) { if (r_file_is_directory (path)) {
r_sys_mkdirp (dstp); r_sys_mkdirp (dstp);
@ -95,7 +94,7 @@ static char *strip_sys_dir(const char *path) {
} }
static Sdb *vcdb_open(const char *rp) { static Sdb *vcdb_open(const char *rp) {
char *frp = r_str_newf ("%s" R_SYS_DIR ".rvc" R_SYS_DIR DBNAME, rp); char *frp = r_file_new (rp, ".rvc", DBNAME, NULL);
if (!frp) { if (!frp) {
return NULL; return NULL;
} }
@ -114,7 +113,7 @@ static Sdb *vcdb_open(const char *rp) {
} }
static bool repo_exists(const char *path) { static bool repo_exists(const char *path) {
char *rp = r_str_newf ("%s" R_SYS_DIR ".rvc", path); char *rp = r_file_new (path, ".rvc", NULL);
if (!rp) { if (!rp) {
return false; return false;
} }
@ -123,9 +122,9 @@ static bool repo_exists(const char *path) {
return false; return false;
} }
bool r = true; bool r = true;
char *files[3] = {r_str_newf ("%s" R_SYS_DIR DBNAME, rp), char *files[3] = {r_file_new (rp, DBNAME, NULL),
r_str_newf ("%s" R_SYS_DIR "commits", rp), r_file_new (rp, "commits", NULL),
r_str_newf ("%s" R_SYS_DIR "blobs", rp), r_file_new (rp, "blobs", NULL)
}; };
free (rp); free (rp);
size_t i; size_t i;
@ -216,7 +215,7 @@ char *rp2absp(const char *rp, const char *path) {
if (!arp) { if (!arp) {
return NULL; return NULL;
} }
char *appended = r_str_newf ("%s" R_SYS_DIR "%s", arp, path); char *appended = r_file_new (arp, path, NULL);
free (arp); free (arp);
if (!appended) { if (!appended) {
return NULL; return NULL;
@ -356,8 +355,8 @@ static RList *get_blobs(const char *rp, RList *ignore) {
RListIter *i; RListIter *i;
char *hash; char *hash;
r_list_foreach (commits, i, hash) { r_list_foreach (commits, i, hash) {
char *commit_path = r_str_newf ("%s" R_SYS_DIR ".rvc" R_SYS_DIR char *commit_path = r_file_new (rp, ".rvc", "commits",
"commits" R_SYS_DIR "%s", rp, hash); hash, NULL);
if (!commit_path) { if (!commit_path) {
free_blobs (ret); free_blobs (ret);
ret = NULL; ret = NULL;
@ -411,7 +410,7 @@ static RList *get_blobs(const char *rp, RList *ignore) {
} }
static bool rm_empty_dir(const char *rp) { static bool rm_empty_dir(const char *rp) {
char *rvc = r_str_newf ("%s" R_SYS_DIR ".rvc", rp); char *rvc = r_file_new (rp, ".rvc", NULL);
if (!rvc) { if (!rvc) {
return false; return false;
} }
@ -434,7 +433,7 @@ static bool traverse_files(RList *dst, const char *dir) {
bool ret = true; bool ret = true;
RList *files = r_sys_dir (dir); RList *files = r_sys_dir (dir);
if (!r_list_empty (dst)) { if (!r_list_empty (dst)) {
char *vcp = r_str_newf ("%s" R_SYS_DIR ".rvc", dir); char *vcp = r_file_new (dir, ".rvc", NULL);
if (!vcp) { if (!vcp) {
r_list_free (files); r_list_free (files);
return false; return false;
@ -458,7 +457,7 @@ static bool traverse_files(RList *dst, const char *dir) {
if (!strcmp (name, ".rvc")) { if (!strcmp (name, ".rvc")) {
continue; continue;
} }
path = r_str_newf ("%s" R_SYS_DIR "%s", dir, name); path = r_file_new (dir, name, NULL);
if (!path) { if (!path) {
ret = false; ret = false;
break; break;
@ -644,8 +643,7 @@ static char *write_commit(const char *rp, const char *message, const char *autho
free (content); free (content);
return false; return false;
} }
char *commit_path = r_str_newf ("%s" R_SYS_DIR ".rvc" R_SYS_DIR "commits" char *commit_path = r_file_new (rp, ".rvc","commits", commit_hash, NULL);
R_SYS_DIR "%s", rp, commit_hash);
if (!commit_path || !r_file_dump (commit_path, (const ut8*)content, -1, false)) { if (!commit_path || !r_file_dump (commit_path, (const ut8*)content, -1, false)) {
free (content); free (content);
free (commit_hash); free (commit_hash);
@ -684,8 +682,7 @@ static RvcBlob *bfadd(const char *rp, const char *fname) {
free (absp); free (absp);
goto fail_ret; goto fail_ret;
} }
char *bpath = r_str_newf ("%s" R_SYS_DIR ".rvc" R_SYS_DIR "blobs" char *bpath = r_file_new (rp, ".rvc", "blobs", ret->fhash, NULL);
R_SYS_DIR "%s", rp, ret->fhash);
if (!bpath) { if (!bpath) {
goto fail_ret; goto fail_ret;
} }
@ -914,7 +911,7 @@ R_API bool r_vc_branch(const char *rp, const char *bname) {
R_API bool r_vc_new(const char *path) { R_API bool r_vc_new(const char *path) {
Sdb *db; Sdb *db;
char *commitp, *blobsp; char *commitp, *blobsp;
char *vcp = r_str_newf ("%s" R_SYS_DIR ".rvc", path); char *vcp = r_file_new (path, ".rvc", NULL);
if (r_file_is_directory (vcp)) { if (r_file_is_directory (vcp)) {
eprintf ("A repository already exists in %s\n", path); eprintf ("A repository already exists in %s\n", path);
free (vcp); free (vcp);
@ -924,8 +921,8 @@ R_API bool r_vc_new(const char *path) {
if (!vcp) { if (!vcp) {
return false; return false;
} }
commitp = r_str_newf ("%s" R_SYS_DIR "commits", vcp); commitp = r_file_new (vcp, "commits", NULL);
blobsp = r_str_newf ("%s" R_SYS_DIR "blobs", vcp); blobsp = r_file_new (vcp, "blobs", NULL);
if (!commitp || !blobsp) { if (!commitp || !blobsp) {
free (commitp); free (commitp);
free (blobsp); free (blobsp);
@ -1043,8 +1040,7 @@ R_API bool r_vc_checkout(const char *rp, const char *bname) {
} }
continue; continue;
} }
char *blob_path = r_str_newf ("%s" R_SYS_DIR ".rvc" R_SYS_DIR char *blob_path = r_file_new (rp, ".rvc", "blobs", fhash, NULL);
"blobs" R_SYS_DIR "%s", rp, fhash);
free (fhash); free (fhash);
if (!blob_path) { if (!blob_path) {
goto fail_ret; goto fail_ret;
@ -1085,7 +1081,7 @@ R_API RList *r_vc_log(const char *rp) {
RListIter *iter; RListIter *iter;
char *ch; char *ch;
r_list_foreach_prev (commits, iter, ch) { r_list_foreach_prev (commits, iter, ch) {
char *cp = r_str_newf ("%s" R_SYS_DIR ".rvc" R_SYS_DIR "commits" R_SYS_DIR "%s", rp, ch); char *cp = r_file_new (rp, ".rvc", "commits", ch, NULL);
if (!cp) { if (!cp) {
goto fail_ret; goto fail_ret;
} }
@ -1250,9 +1246,7 @@ R_API bool r_vc_reset(const char *rp) {
continue; continue;
} }
blobp = r_str_newf ("%s" R_SYS_DIR ".rvc" R_SYS_DIR blobp = r_file_new (rp, ".rvc", "blobs", b);
R_SYS_DIR "blobs" R_SYS_DIR
"%s", rp, b);
free (b); free (b);
} }
if (!blobp) { if (!blobp) {
@ -1321,8 +1315,8 @@ R_API bool rvc_git_checkout(const RCore *core, const char *rp, const char *bname
R_API bool rvc_git_repo_exists(const RCore *core, const char *rp) { R_API bool rvc_git_repo_exists(const RCore *core, const char *rp) {
char *frp = !strcmp (r_config_get (core->config, "prj.vc.type"), "rvc")? char *frp = !strcmp (r_config_get (core->config, "prj.vc.type"), "rvc")?
r_str_newf ("%s" R_SYS_DIR ".rvc", rp): r_file_new (rp, ".rvc", NULL):
r_str_newf ("%s" R_SYS_DIR ".git", rp); r_file_new (rp, ".git", NULL);
if (frp) { if (frp) {
bool ret = r_file_is_directory (frp); bool ret = r_file_is_directory (frp);
free (frp); free (frp);