ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-22 14:21:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

main: simplify _main_repath

Browse Source
This commit is contained in:
Jōshin 2022-01-31 10:59:23 -06:00
parent b5a49a159f
commit 2a5baa9e3f
No known key found for this signature in database
GPG Key ID: A8BE5A9A521639D0
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/urbit/daemon/main.c
View File

@ -63,7 +63,6 @@ _main_repath(c3_c* pax_c)
c3_c* fas_c; c3_c* fas_c;
c3_c* dir_c; c3_c* dir_c;
c3_w len_w; c3_w len_w;
c3_i wit_i;
if ( 0 != (rel_c = realpath(pax_c, 0)) ) { if ( 0 != (rel_c = realpath(pax_c, 0)) ) {
return rel_c; return rel_c;
@ -75,16 +74,16 @@ _main_repath(c3_c* pax_c)
} }
c3_assert(u3_unix_safe(fas_c + 1)); c3_assert(u3_unix_safe(fas_c + 1));
*fas_c = 0; *fas_c = 0;
if ( 0 == (dir_c = realpath(pax_c, 0)) ) { dir_c = realpath(pax_c, 0);
*fas_c = '/'; *fas_c = '/';
if ( 0 == dir_c ) {
return 0; return 0;
} }
len_w = strlen(dir_c) + strlen(fas_c + 1) + 2; len_w = strlen(dir_c) + strlen(fas_c) + 1;
rel_c = c3_malloc(len_w); rel_c = c3_malloc(len_w);
wit_i = snprintf(rel_c, len_w, "%s/%s", dir_c, fas_c + 1); strcpy(rel_c, dir_c);
c3_assert(wit_i >= 0 && (c3_w)wit_i + 1 == len_w);
*fas_c = '/';
c3_free(dir_c); c3_free(dir_c);
strcat(rel_c, fas_c);
return rel_c; return rel_c;
} }