Displaying 3 results from an estimated 3 matches for "ext_install_ldlinux_sys".
2015 Nov 13
4
[PATCH 1/4] extlinux: simplification
Merge installation of ldlinux.c32 from ext2_fat_install_file,
btrfs_install_file and xfs_install_file into one function
ext_install_ldlinux_c32
Signed-off-by: Nicolas Cornu <nicolac76 at yahoo.fr>
---
extlinux/main.c | 106 +++++++++++++++++++++-----------------------------------
1 file changed, 40 insertions(+), 66 deletions(-)
diff --git a/extlinux/main.c b/extlinux/main.c
index
2015 Nov 18
1
[PATCH 4/4] extlinux: simplification by removing one label
...+++ b/extlinux/main.c
> @@ -735,28 +735,22 @@ static int xfs_install_file(const char *path, int
> devfd, struct stat *rst)
> dirfd = open(path, O_RDONLY | O_DIRECTORY);
> if (dirfd < 0) {
> perror(path);
> - goto bail;
> + return 1;
> }
>
> - if (ext_install_ldlinux_sys(devfd, path, rst))
> - goto bail;
> + if (ext_install_ldlinux_sys(devfd, path, rst)) {
> + close(dirfd);
> + return 1;
> + }
>
> close(dirfd);
>
> - dirfd = -1;
> -
> if (ext_install_ldlinux_c32(path))
> - goto bail;
> + return 1;
>
>...
2015 Nov 13
0
[PATCH 4/4] extlinux: simplification by removing one label
...x 43c1a31..8b97a71 100644
--- a/extlinux/main.c
+++ b/extlinux/main.c
@@ -735,28 +735,22 @@ static int xfs_install_file(const char *path, int devfd, struct stat *rst)
dirfd = open(path, O_RDONLY | O_DIRECTORY);
if (dirfd < 0) {
perror(path);
- goto bail;
+ return 1;
}
- if (ext_install_ldlinux_sys(devfd, path, rst))
- goto bail;
+ if (ext_install_ldlinux_sys(devfd, path, rst)) {
+ close(dirfd);
+ return 1;
+ }
close(dirfd);
- dirfd = -1;
-
if (ext_install_ldlinux_c32(path))
- goto bail;
+ return 1;
sync();
return 0;
-
-bail:
- if (dirfd >= 0)
- clos...