From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 06/13] installer: Make hw_mkdir static Date: Fri, 05 Apr 2024 12:59:35 +0000 Message-ID: <20240405125942.1803058-6-michael.tremer@ipfire.org> In-Reply-To: <20240405125942.1803058-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============9196160952486513675==" List-Id: --===============9196160952486513675== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Michael Tremer --- src/installer/hw.c | 86 +++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/src/installer/hw.c b/src/installer/hw.c index f4a84804d..f05608fd1 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -54,6 +54,48 @@ static int system_chroot(const char* output, const char* p= ath, const char* cmd) return mysystem(output, chroot_cmd); } =20 +static int hw_mkdir(const char *dir) { + char tmp[STRING_SIZE]; + char *p =3D NULL; + size_t len; + int r; + + snprintf(tmp, sizeof(tmp),"%s",dir); + len =3D strlen(tmp); + + if (tmp[len - 1] =3D=3D '/') { + tmp[len - 1] =3D 0; + } + + for (p =3D tmp + 1; *p; p++) { + if (*p =3D=3D '/') { + *p =3D 0; + + // Create target if it does not exist + if (access(tmp, X_OK) !=3D 0) { + r =3D mkdir(tmp, S_IRWXU|S_IRWXG|S_IRWXO); + + if (r) { + return r; + } + } + + *p =3D '/'; + } + } + + // Create target if it does not exist + if (access(tmp, X_OK) !=3D 0) { + r =3D mkdir(tmp, S_IRWXU|S_IRWXG|S_IRWXO); + + if (r) { + return r; + } + } + + return 0; +} + struct hw* hw_init() { struct hw* hw =3D calloc(1, sizeof(*hw)); assert(hw); @@ -959,7 +1001,7 @@ static int hw_mount_btrfs_subvolumes(const char* source)= { return r; =20 // Create the directory. - r =3D hw_mkdir(path, S_IRWXU|S_IRWXG|S_IRWXO); + r =3D hw_mkdir(path); =20 // Abort if the directory could not be created. if(r !=3D 0 && errno !=3D EEXIST) @@ -1416,45 +1458,3 @@ int hw_restore_backup(const char* output, const char* = backup_path, const char* d =20 return 0; } - -int hw_mkdir(const char *dir) { - char tmp[STRING_SIZE]; - char *p =3D NULL; - size_t len; - int r; - - snprintf(tmp, sizeof(tmp),"%s",dir); - len =3D strlen(tmp); - - if (tmp[len - 1] =3D=3D '/') { - tmp[len - 1] =3D 0; - } - - for (p =3D tmp + 1; *p; p++) { - if (*p =3D=3D '/') { - *p =3D 0; - - // Create target if it does not exist - if (access(tmp, X_OK) !=3D 0) { - r =3D mkdir(tmp, S_IRWXU|S_IRWXG|S_IRWXO); - - if (r) { - return r; - } - } - - *p =3D '/'; - } - } - - // Create target if it does not exist - if (access(tmp, X_OK) !=3D 0) { - r =3D mkdir(tmp, S_IRWXU|S_IRWXG|S_IRWXO); - - if (r) { - return r; - } - } - - return 0; -} --=20 2.39.2 --===============9196160952486513675==--