hyung-hwan/hio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

implemented a simple untar method in hio-webs

Browse Source
This commit is contained in:
hyung-hwan
2022-12-13 16:17:39 +00:00
parent 7904964e0d
commit f917a0ec69
4 changed files with 53 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/hio-tar.h
View File

@ -85,6 +85,8 @@ struct hio_tar_t
struct
{
hio_bch_t root[2048];
hio_tar_state_t state;
struct
{
@ -135,6 +137,11 @@ HIO_EXPORT int hio_tar_xfeed (
hio_oow_t len
);
HIO_EXPORT void hio_tar_setxrootwithbcstr (
hio_tar_t* tar,
const hio_bch_t* root
);
#if defined(__cplusplus)
}
#endif

15
lib/tar.c
View File

@ -136,11 +136,13 @@ static int x_process_header (hio_tar_t* tar)
}
hio_becs_clear (&tar->x.hi.filename);
if (hio_becs_cat(&tar->x.hi.filename, hdr->prefix) == (hio_oow_t)-1 ||
hio_becs_cat(&tar->x.hi.filename, hdr->name) == (hio_oow_t)-1)
if (tar->x.root[0] != '\0')
{
return -1;
if (hio_becs_cat(&tar->x.hi.filename, tar->x.root) == (hio_oow_t)-1) return -1;
if (HIO_BECS_LASTCHAR(&tar->x.hi.filename) != '/' && hio_becs_ccat(&tar->x.hi.filename, '/') == (hio_oow_t)-1) return -1;
}
if (hio_becs_cat(&tar->x.hi.filename, hdr->prefix) == (hio_oow_t)-1 ||
hio_becs_cat(&tar->x.hi.filename, hdr->name) == (hio_oow_t)-1) return -1;
filename = HIO_BECS_PTR(&tar->x.hi.filename);
switch (hdr->typeflag)
@ -158,7 +160,7 @@ static int x_process_header (hio_tar_t* tar)
mknod (filename, S_IFBLK | tar->x.hi.filemode, ((tar->x.hi.devmajor << 8) | tar->x.hi.devminor));
break;
case HIO_TAR_DIRTYPE:
create_dir (hdr->name, tar->x.hi.filemode);
create_dir (filename, tar->x.hi.filemode);
break;
case HIO_TAR_FIFOTYPE:
mkfifo (filename, tar->x.hi.filemode);
@ -272,3 +274,8 @@ int hio_tar_xfeed (hio_tar_t* tar, const void* ptr, hio_oow_t len)
return 0;
}
void hio_tar_setxrootwithbcstr (hio_tar_t* tar, const hio_bch_t* root)
{
hio_copy_bcstr (tar->x.root, HIO_COUNTOF(tar->x.root), root); /* TOOD: handle truncation. make tar->x.root dyanmic? */
}