Skip to content

Commit f412313

Browse files
committed
Move getuid() so its no longer splitting squashfs stuff apart
1 parent 5f41b75 commit f412313

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/RootFS.jl

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,6 @@ function supported_platforms()
142142
]
143143
end
144144

145-
# Note: produce these values by #including squashfs_fs.h from linux in Cxx.jl
146-
# and running the indicated command
147-
const offsetof_id_table_start = 0x30 # offsetof(struct suqashfs_super_block, id_table_start)
148-
const offsetof_no_ids = 0x1a # offsetof(struct suqashfs_super_block, no_ids)
149-
150-
# From squashfs_fs.h
151-
const SQUASHFS_COMPRESSED_BIT = UInt16(1) << 15
152-
const SQUASHFS_MAGIC = 0x73717368
153-
154145
"""
155146
getuid()
156147
@@ -160,6 +151,15 @@ function getuid()
160151
return ccall(:getuid, Cint, ())
161152
end
162153

154+
# Note: produce these values by #including squashfs_fs.h from linux in Cxx.jl
155+
# and running the indicated command
156+
const offsetof_id_table_start = 0x30 # offsetof(struct suqashfs_super_block, id_table_start)
157+
const offsetof_no_ids = 0x1a # offsetof(struct suqashfs_super_block, no_ids)
158+
159+
# From squashfs_fs.h
160+
const SQUASHFS_COMPRESSED_BIT = UInt16(1) << 15
161+
const SQUASHFS_MAGIC = 0x73717368
162+
163163
"""
164164
rewrite_squashfs_uids(path, new_uid)
165165

0 commit comments

Comments
 (0)