mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-21 14:59:34 +00:00
add minix fs support. use the name "the grub shell" instead of "the stage2 emulator".
This commit is contained in:
okuji committed
1 parent
29286d8365
commit
434d8607cc
20 files changed
+899
-108
No files matched your search
+14
-5
@@ -14,16 +14,18 @@ INCLUDES = -I$(top_srcdir)/stage1
|
||||
# The library for /sbin/grub.
|
||||
noinst_LIBRARIES = libgrub.a
|
||||
libgrub_a_SOURCES = boot.c common.c char_io.c cmdline.c disk_io.c \
|
||||
gunzip.c fsys_ffs.c fsys_ext2fs.c fsys_fat.c stage2.c
|
||||
gunzip.c fsys_ffs.c fsys_ext2fs.c fsys_fat.c fsys_minix.c \
|
||||
stage2.c
|
||||
libgrub_a_CFLAGS = @GRUB_CFLAGS@ -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 \
|
||||
-DFSYS_FAT=1 -DFSYS_FFS=1 -fwritable-strings
|
||||
-DFSYS_FAT=1 -DFSYS_FFS=1 -DFSYS_MINIX=1 -fwritable-strings
|
||||
|
||||
# Stage 2 and Stage 1.5's.
|
||||
pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
|
||||
nodist_pkgdata_DATA = stage2 e2fs_stage1_5 fat_stage1_5 ffs_stage1_5
|
||||
nodist_pkgdata_DATA = stage2 e2fs_stage1_5 fat_stage1_5 ffs_stage1_5 \
|
||||
minix_stage1_5
|
||||
CLEANFILES = $(pkgdata_DATA)
|
||||
noinst_PROGRAMS = stage2.exec e2fs_stage1_5.exec fat_stage1_5.exec \
|
||||
ffs_stage1_5.exec
|
||||
ffs_stage1_5.exec minix_stage1_5.exec
|
||||
MOSTLYCLEANFILES = $(noinst_PROGRAMS)
|
||||
|
||||
STAGE2_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,8000
|
||||
@@ -37,7 +39,7 @@ STAGE1_5_COMPILE = $(STAGE2_COMPILE) -DNO_DECOMPRESSION=1 -DSTAGE1_5=1 \
|
||||
# For stage2 target.
|
||||
stage2_exec_SOURCES = asm.S boot.c common.c char_io.c cmdline.c \
|
||||
disk_io.c gunzip.c stage2.c bios.c smp-imps.c fsys_ext2fs.c \
|
||||
fsys_fat.c fsys_ffs.c
|
||||
fsys_fat.c fsys_ffs.c fsys_minix.c
|
||||
stage2_exec_CFLAGS = $(STAGE2_COMPILE) @FSYS_CFLAGS@
|
||||
stage2_exec_LDFLAGS = $(STAGE2_LINK)
|
||||
|
||||
@@ -62,6 +64,13 @@ ffs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
|
||||
-DNO_BLOCK_FILES=1
|
||||
ffs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
|
||||
|
||||
# For minix_stage1_5 target.
|
||||
minix_stage1_5_exec_SOURCES = asm.S common.c char_io.c disk_io.c \
|
||||
stage1_5.c fsys_minix.c bios.c
|
||||
minix_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
|
||||
-DNO_BLOCK_FILES=1
|
||||
minix_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
|
||||
|
||||
# General rule for making a raw binary.
|
||||
%: %.exec
|
||||
$(OBJCOPY) -O binary $< $@
|
||||
+197
-12
@@ -95,18 +95,21 @@ INCLUDES = -I$(top_srcdir)/stage1
|
||||
# The library for /sbin/grub.
|
||||
noinst_LIBRARIES = libgrub.a
|
||||
libgrub_a_SOURCES = boot.c common.c char_io.c cmdline.c disk_io.c \
|
||||
gunzip.c fsys_ffs.c fsys_ext2fs.c fsys_fat.c stage2.c
|
||||
gunzip.c fsys_ffs.c fsys_ext2fs.c fsys_fat.c fsys_minix.c \
|
||||
stage2.c
|
||||
|
||||
libgrub_a_CFLAGS = @GRUB_CFLAGS@ -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 \
|
||||
-DFSYS_FAT=1 -DFSYS_FFS=1 -fwritable-strings
|
||||
-DFSYS_FAT=1 -DFSYS_FFS=1 -DFSYS_MINIX=1 -fwritable-strings
|
||||
|
||||
|
||||
# Stage 2 and Stage 1.5's.
|
||||
pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
|
||||
nodist_pkgdata_DATA = stage2 e2fs_stage1_5 fat_stage1_5 ffs_stage1_5
|
||||
nodist_pkgdata_DATA = stage2 e2fs_stage1_5 fat_stage1_5 ffs_stage1_5 \
|
||||
minix_stage1_5
|
||||
|
||||
CLEANFILES = $(pkgdata_DATA)
|
||||
noinst_PROGRAMS = stage2.exec e2fs_stage1_5.exec fat_stage1_5.exec \
|
||||
ffs_stage1_5.exec
|
||||
ffs_stage1_5.exec minix_stage1_5.exec
|
||||
|
||||
MOSTLYCLEANFILES = $(noinst_PROGRAMS)
|
||||
|
||||
@@ -122,7 +125,7 @@ STAGE1_5_COMPILE = $(STAGE2_COMPILE) -DNO_DECOMPRESSION=1 -DSTAGE1_5=1 \
|
||||
# For stage2 target.
|
||||
stage2_exec_SOURCES = asm.S boot.c common.c char_io.c cmdline.c \
|
||||
disk_io.c gunzip.c stage2.c bios.c smp-imps.c fsys_ext2fs.c \
|
||||
fsys_fat.c fsys_ffs.c
|
||||
fsys_fat.c fsys_ffs.c fsys_minix.c
|
||||
|
||||
stage2_exec_CFLAGS = $(STAGE2_COMPILE) @FSYS_CFLAGS@
|
||||
stage2_exec_LDFLAGS = $(STAGE2_LINK)
|
||||
@@ -152,6 +155,15 @@ ffs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
|
||||
-DNO_BLOCK_FILES=1
|
||||
|
||||
ffs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
|
||||
|
||||
# For minix_stage1_5 target.
|
||||
minix_stage1_5_exec_SOURCES = asm.S common.c char_io.c disk_io.c \
|
||||
stage1_5.c fsys_minix.c bios.c
|
||||
|
||||
minix_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
|
||||
-DNO_BLOCK_FILES=1
|
||||
|
||||
minix_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
|
||||
subdir = stage2
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_CLEAN_FILES =
|
||||
@@ -167,7 +179,7 @@ libgrub_a_LIBADD =
|
||||
am_libgrub_a_OBJECTS = libgrub_a-boot.o libgrub_a-common.o \
|
||||
libgrub_a-char_io.o libgrub_a-cmdline.o libgrub_a-disk_io.o \
|
||||
libgrub_a-gunzip.o libgrub_a-fsys_ffs.o libgrub_a-fsys_ext2fs.o \
|
||||
libgrub_a-fsys_fat.o libgrub_a-stage2.o
|
||||
libgrub_a-fsys_fat.o libgrub_a-fsys_minix.o libgrub_a-stage2.o
|
||||
libgrub_a_OBJECTS = $(am_libgrub_a_OBJECTS)
|
||||
AR = ar
|
||||
PROGRAMS = $(noinst_PROGRAMS)
|
||||
@@ -193,11 +205,18 @@ ffs_stage1_5_exec-fsys_ffs.o ffs_stage1_5_exec-bios.o
|
||||
ffs_stage1_5_exec_OBJECTS = $(am_ffs_stage1_5_exec_OBJECTS)
|
||||
ffs_stage1_5_exec_LDADD = $(LDADD)
|
||||
ffs_stage1_5_exec_DEPENDENCIES =
|
||||
am_minix_stage1_5_exec_OBJECTS = minix_stage1_5_exec-asm.o \
|
||||
minix_stage1_5_exec-common.o minix_stage1_5_exec-char_io.o \
|
||||
minix_stage1_5_exec-disk_io.o minix_stage1_5_exec-stage1_5.o \
|
||||
minix_stage1_5_exec-fsys_minix.o minix_stage1_5_exec-bios.o
|
||||
minix_stage1_5_exec_OBJECTS = $(am_minix_stage1_5_exec_OBJECTS)
|
||||
minix_stage1_5_exec_LDADD = $(LDADD)
|
||||
minix_stage1_5_exec_DEPENDENCIES =
|
||||
am_stage2_exec_OBJECTS = stage2_exec-asm.o stage2_exec-boot.o \
|
||||
stage2_exec-common.o stage2_exec-char_io.o stage2_exec-cmdline.o \
|
||||
stage2_exec-disk_io.o stage2_exec-gunzip.o stage2_exec-stage2.o \
|
||||
stage2_exec-bios.o stage2_exec-smp-imps.o stage2_exec-fsys_ext2fs.o \
|
||||
stage2_exec-fsys_fat.o stage2_exec-fsys_ffs.o
|
||||
stage2_exec-fsys_fat.o stage2_exec-fsys_ffs.o stage2_exec-fsys_minix.o
|
||||
stage2_exec_OBJECTS = $(am_stage2_exec_OBJECTS)
|
||||
stage2_exec_LDADD = $(LDADD)
|
||||
stage2_exec_DEPENDENCIES =
|
||||
@@ -209,7 +228,7 @@ CCLD = $(CC)
|
||||
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||
DIST_SOURCES = $(libgrub_a_SOURCES) $(e2fs_stage1_5_exec_SOURCES) \
|
||||
$(fat_stage1_5_exec_SOURCES) $(ffs_stage1_5_exec_SOURCES) \
|
||||
$(stage2_exec_SOURCES)
|
||||
$(minix_stage1_5_exec_SOURCES) $(stage2_exec_SOURCES)
|
||||
DATA = $(nodist_pkgdata_DATA)
|
||||
|
||||
HEADERS = $(noinst_HEADERS)
|
||||
@@ -222,10 +241,10 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
GZIP_ENV = --best
|
||||
DEP_FILES = .deps/asm.P .deps/bios.P .deps/boot.P .deps/char_io.P \
|
||||
.deps/cmdline.P .deps/common.P .deps/disk_io.P .deps/fsys_ext2fs.P \
|
||||
.deps/fsys_fat.P .deps/fsys_ffs.P .deps/gunzip.P .deps/smp-imps.P \
|
||||
.deps/stage1_5.P .deps/stage2.P
|
||||
SOURCES = $(libgrub_a_SOURCES) $(e2fs_stage1_5_exec_SOURCES) $(fat_stage1_5_exec_SOURCES) $(ffs_stage1_5_exec_SOURCES) $(stage2_exec_SOURCES)
|
||||
OBJECTS = $(am_libgrub_a_OBJECTS) $(am_e2fs_stage1_5_exec_OBJECTS) $(am_fat_stage1_5_exec_OBJECTS) $(am_ffs_stage1_5_exec_OBJECTS) $(am_stage2_exec_OBJECTS)
|
||||
.deps/fsys_fat.P .deps/fsys_ffs.P .deps/fsys_minix.P .deps/gunzip.P \
|
||||
.deps/smp-imps.P .deps/stage1_5.P .deps/stage2.P
|
||||
SOURCES = $(libgrub_a_SOURCES) $(e2fs_stage1_5_exec_SOURCES) $(fat_stage1_5_exec_SOURCES) $(ffs_stage1_5_exec_SOURCES) $(minix_stage1_5_exec_SOURCES) $(stage2_exec_SOURCES)
|
||||
OBJECTS = $(am_libgrub_a_OBJECTS) $(am_e2fs_stage1_5_exec_OBJECTS) $(am_fat_stage1_5_exec_OBJECTS) $(am_ffs_stage1_5_exec_OBJECTS) $(am_minix_stage1_5_exec_OBJECTS) $(am_stage2_exec_OBJECTS)
|
||||
|
||||
all: all-redirect
|
||||
.SUFFIXES:
|
||||
@@ -265,6 +284,7 @@ libgrub_a-gunzip.o: gunzip.c
|
||||
libgrub_a-fsys_ffs.o: fsys_ffs.c
|
||||
libgrub_a-fsys_ext2fs.o: fsys_ext2fs.c
|
||||
libgrub_a-fsys_fat.o: fsys_fat.c
|
||||
libgrub_a-fsys_minix.o: fsys_minix.c
|
||||
libgrub_a-stage2.o: stage2.c
|
||||
|
||||
libgrub.a: $(libgrub_a_OBJECTS) $(libgrub_a_DEPENDENCIES)
|
||||
@@ -316,6 +336,18 @@ ffs_stage1_5_exec-bios.o: bios.c
|
||||
ffs_stage1_5.exec: $(ffs_stage1_5_exec_OBJECTS) $(ffs_stage1_5_exec_DEPENDENCIES)
|
||||
@rm -f ffs_stage1_5.exec
|
||||
$(LINK) $(ffs_stage1_5_exec_LDFLAGS) $(ffs_stage1_5_exec_OBJECTS) $(ffs_stage1_5_exec_LDADD) $(LIBS)
|
||||
minix_stage1_5_exec-asm.o: asm.S
|
||||
$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -c -o minix_stage1_5_exec-asm.o $<
|
||||
minix_stage1_5_exec-common.o: common.c
|
||||
minix_stage1_5_exec-char_io.o: char_io.c
|
||||
minix_stage1_5_exec-disk_io.o: disk_io.c
|
||||
minix_stage1_5_exec-stage1_5.o: stage1_5.c
|
||||
minix_stage1_5_exec-fsys_minix.o: fsys_minix.c
|
||||
minix_stage1_5_exec-bios.o: bios.c
|
||||
|
||||
minix_stage1_5.exec: $(minix_stage1_5_exec_OBJECTS) $(minix_stage1_5_exec_DEPENDENCIES)
|
||||
@rm -f minix_stage1_5.exec
|
||||
$(LINK) $(minix_stage1_5_exec_LDFLAGS) $(minix_stage1_5_exec_OBJECTS) $(minix_stage1_5_exec_LDADD) $(LIBS)
|
||||
stage2_exec-asm.o: asm.S
|
||||
$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stage2_exec_CFLAGS) $(CFLAGS) -c -o stage2_exec-asm.o $<
|
||||
stage2_exec-boot.o: boot.c
|
||||
@@ -330,6 +362,7 @@ stage2_exec-smp-imps.o: smp-imps.c
|
||||
stage2_exec-fsys_ext2fs.o: fsys_ext2fs.c
|
||||
stage2_exec-fsys_fat.o: fsys_fat.c
|
||||
stage2_exec-fsys_ffs.o: fsys_ffs.c
|
||||
stage2_exec-fsys_minix.o: fsys_minix.c
|
||||
|
||||
stage2.exec: $(stage2_exec_OBJECTS) $(stage2_exec_DEPENDENCIES)
|
||||
@rm -f stage2.exec
|
||||
@@ -612,6 +645,25 @@ libgrub_a-fsys_fat.lo: fsys_fat.c
|
||||
>> .deps/$(*D)/$(*F).P; \
|
||||
rm -f .deps/$(*D)/$(*F).pp
|
||||
|
||||
libgrub_a-fsys_minix.o: fsys_minix.c
|
||||
@echo '$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrub_a_CFLAGS) $(CFLAGS) -c -o $@ $<'; \
|
||||
$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrub_a_CFLAGS) $(CFLAGS) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $<
|
||||
@-cp .deps/$(*D)/$(*F).pp .deps/$(*D)/$(*F).P; \
|
||||
tr ' ' '\012' < .deps/$(*D)/$(*F).pp \
|
||||
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||
>> .deps/$(*D)/$(*F).P; \
|
||||
rm .deps/$(*D)/$(*F).pp
|
||||
|
||||
libgrub_a-fsys_minix.lo: fsys_minix.c
|
||||
@echo '$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrub_a_CFLAGS) $(CFLAGS) -c -o $@ $<'; \
|
||||
$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrub_a_CFLAGS) $(CFLAGS) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $<
|
||||
@-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
|
||||
< .deps/$(*D)/$(*F).pp > .deps/$(*D)/$(*F).P; \
|
||||
tr ' ' '\012' < .deps/$(*D)/$(*F).pp \
|
||||
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||
>> .deps/$(*D)/$(*F).P; \
|
||||
rm -f .deps/$(*D)/$(*F).pp
|
||||
|
||||
libgrub_a-stage2.o: stage2.c
|
||||
@echo '$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrub_a_CFLAGS) $(CFLAGS) -c -o $@ $<'; \
|
||||
$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrub_a_CFLAGS) $(CFLAGS) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $<
|
||||
@@ -973,6 +1025,120 @@ ffs_stage1_5_exec-bios.lo: bios.c
|
||||
>> .deps/$(*D)/$(*F).P; \
|
||||
rm -f .deps/$(*D)/$(*F).pp
|
||||
|
||||
minix_stage1_5_exec-common.o: common.c
|
||||
@echo '$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -c -o $@ $<'; \
|
||||
$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $<
|
||||
@-cp .deps/$(*D)/$(*F).pp .deps/$(*D)/$(*F).P; \
|
||||
tr ' ' '\012' < .deps/$(*D)/$(*F).pp \
|
||||
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||
>> .deps/$(*D)/$(*F).P; \
|
||||
rm .deps/$(*D)/$(*F).pp
|
||||
|
||||
minix_stage1_5_exec-common.lo: common.c
|
||||
@echo '$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -c -o $@ $<'; \
|
||||
$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $<
|
||||
@-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
|
||||
< .deps/$(*D)/$(*F).pp > .deps/$(*D)/$(*F).P; \
|
||||
tr ' ' '\012' < .deps/$(*D)/$(*F).pp \
|
||||
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||
>> .deps/$(*D)/$(*F).P; \
|
||||
rm -f .deps/$(*D)/$(*F).pp
|
||||
|
||||
minix_stage1_5_exec-char_io.o: char_io.c
|
||||
@echo '$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -c -o $@ $<'; \
|
||||
$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $<
|
||||
@-cp .deps/$(*D)/$(*F).pp .deps/$(*D)/$(*F).P; \
|
||||
tr ' ' '\012' < .deps/$(*D)/$(*F).pp \
|
||||
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||
>> .deps/$(*D)/$(*F).P; \
|
||||
rm .deps/$(*D)/$(*F).pp
|
||||
|
||||
minix_stage1_5_exec-char_io.lo: char_io.c
|
||||
@echo '$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -c -o $@ $<'; \
|
||||
$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $<
|
||||
@-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
|
||||
< .deps/$(*D)/$(*F).pp > .deps/$(*D)/$(*F).P; \
|
||||
tr ' ' '\012' < .deps/$(*D)/$(*F).pp \
|
||||
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||
>> .deps/$(*D)/$(*F).P; \
|
||||
rm -f .deps/$(*D)/$(*F).pp
|
||||
|
||||
minix_stage1_5_exec-disk_io.o: disk_io.c
|
||||
@echo '$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -c -o $@ $<'; \
|
||||
$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $<
|
||||
@-cp .deps/$(*D)/$(*F).pp .deps/$(*D)/$(*F).P; \
|
||||
tr ' ' '\012' < .deps/$(*D)/$(*F).pp \
|
||||
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||
>> .deps/$(*D)/$(*F).P; \
|
||||
rm .deps/$(*D)/$(*F).pp
|
||||
|
||||
minix_stage1_5_exec-disk_io.lo: disk_io.c
|
||||
@echo '$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -c -o $@ $<'; \
|
||||
$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $<
|
||||
@-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
|
||||
< .deps/$(*D)/$(*F).pp > .deps/$(*D)/$(*F).P; \
|
||||
tr ' ' '\012' < .deps/$(*D)/$(*F).pp \
|
||||
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||
>> .deps/$(*D)/$(*F).P; \
|
||||
rm -f .deps/$(*D)/$(*F).pp
|
||||
|
||||
minix_stage1_5_exec-stage1_5.o: stage1_5.c
|
||||
@echo '$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -c -o $@ $<'; \
|
||||
$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $<
|
||||
@-cp .deps/$(*D)/$(*F).pp .deps/$(*D)/$(*F).P; \
|
||||
tr ' ' '\012' < .deps/$(*D)/$(*F).pp \
|
||||
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||
>> .deps/$(*D)/$(*F).P; \
|
||||
rm .deps/$(*D)/$(*F).pp
|
||||
|
||||
minix_stage1_5_exec-stage1_5.lo: stage1_5.c
|
||||
@echo '$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -c -o $@ $<'; \
|
||||
$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $<
|
||||
@-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
|
||||
< .deps/$(*D)/$(*F).pp > .deps/$(*D)/$(*F).P; \
|
||||
tr ' ' '\012' < .deps/$(*D)/$(*F).pp \
|
||||
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||
>> .deps/$(*D)/$(*F).P; \
|
||||
rm -f .deps/$(*D)/$(*F).pp
|
||||
|
||||
minix_stage1_5_exec-fsys_minix.o: fsys_minix.c
|
||||
@echo '$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -c -o $@ $<'; \
|
||||
$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $<
|
||||
@-cp .deps/$(*D)/$(*F).pp .deps/$(*D)/$(*F).P; \
|
||||
tr ' ' '\012' < .deps/$(*D)/$(*F).pp \
|
||||
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||
>> .deps/$(*D)/$(*F).P; \
|
||||
rm .deps/$(*D)/$(*F).pp
|
||||
|
||||
minix_stage1_5_exec-fsys_minix.lo: fsys_minix.c
|
||||
@echo '$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -c -o $@ $<'; \
|
||||
$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $<
|
||||
@-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
|
||||
< .deps/$(*D)/$(*F).pp > .deps/$(*D)/$(*F).P; \
|
||||
tr ' ' '\012' < .deps/$(*D)/$(*F).pp \
|
||||
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||
>> .deps/$(*D)/$(*F).P; \
|
||||
rm -f .deps/$(*D)/$(*F).pp
|
||||
|
||||
minix_stage1_5_exec-bios.o: bios.c
|
||||
@echo '$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -c -o $@ $<'; \
|
||||
$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $<
|
||||
@-cp .deps/$(*D)/$(*F).pp .deps/$(*D)/$(*F).P; \
|
||||
tr ' ' '\012' < .deps/$(*D)/$(*F).pp \
|
||||
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||
>> .deps/$(*D)/$(*F).P; \
|
||||
rm .deps/$(*D)/$(*F).pp
|
||||
|
||||
minix_stage1_5_exec-bios.lo: bios.c
|
||||
@echo '$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -c -o $@ $<'; \
|
||||
$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(minix_stage1_5_exec_CFLAGS) $(CFLAGS) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $<
|
||||
@-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
|
||||
< .deps/$(*D)/$(*F).pp > .deps/$(*D)/$(*F).P; \
|
||||
tr ' ' '\012' < .deps/$(*D)/$(*F).pp \
|
||||
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||
>> .deps/$(*D)/$(*F).P; \
|
||||
rm -f .deps/$(*D)/$(*F).pp
|
||||
|
||||
stage2_exec-boot.o: boot.c
|
||||
@echo '$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stage2_exec_CFLAGS) $(CFLAGS) -c -o $@ $<'; \
|
||||
$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stage2_exec_CFLAGS) $(CFLAGS) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $<
|
||||
@@ -1200,6 +1366,25 @@ stage2_exec-fsys_ffs.lo: fsys_ffs.c
|
||||
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||
>> .deps/$(*D)/$(*F).P; \
|
||||
rm -f .deps/$(*D)/$(*F).pp
|
||||
|
||||
stage2_exec-fsys_minix.o: fsys_minix.c
|
||||
@echo '$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stage2_exec_CFLAGS) $(CFLAGS) -c -o $@ $<'; \
|
||||
$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stage2_exec_CFLAGS) $(CFLAGS) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $<
|
||||
@-cp .deps/$(*D)/$(*F).pp .deps/$(*D)/$(*F).P; \
|
||||
tr ' ' '\012' < .deps/$(*D)/$(*F).pp \
|
||||
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||
>> .deps/$(*D)/$(*F).P; \
|
||||
rm .deps/$(*D)/$(*F).pp
|
||||
|
||||
stage2_exec-fsys_minix.lo: fsys_minix.c
|
||||
@echo '$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stage2_exec_CFLAGS) $(CFLAGS) -c -o $@ $<'; \
|
||||
$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stage2_exec_CFLAGS) $(CFLAGS) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $<
|
||||
@-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
|
||||
< .deps/$(*D)/$(*F).pp > .deps/$(*D)/$(*F).P; \
|
||||
tr ' ' '\012' < .deps/$(*D)/$(*F).pp \
|
||||
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||
>> .deps/$(*D)/$(*F).P; \
|
||||
rm -f .deps/$(*D)/$(*F).pp
|
||||
check-TESTS: $(TESTS)
|
||||
@failed=0; all=0; xfail=0; xpass=0; \
|
||||
srcdir=$(srcdir); export srcdir; \
|
||||
|
||||
@@ -40,6 +40,9 @@ struct fsys_entry fsys_table[NUM_FSYS + 1] =
|
||||
# endif
|
||||
# ifdef FSYS_EXT2FS
|
||||
{"ext2fs", ext2fs_mount, ext2fs_read, ext2fs_dir},
|
||||
# endif
|
||||
# ifdef FSYS_MINIX
|
||||
{"minix", minix_mount, minix_read, minix_dir},
|
||||
# endif
|
||||
/* XX FFS should come last as it's superblock is commonly crossing tracks
|
||||
on floppies from track 1 to 2, while others only use 1. */
|
||||
|
||||
+11
-1
@@ -51,8 +51,18 @@ int ext2fs_dir (char *dirname);
|
||||
#define FSYS_EXT2FS_NUM 0
|
||||
#endif
|
||||
|
||||
#ifdef FSYS_MINIX
|
||||
#define FSYS_MINIX_NUM 1
|
||||
int minix_mount (void);
|
||||
int minix_read (char *buf, int len);
|
||||
int minix_dir (char *dirname);
|
||||
#else
|
||||
#define FSYS_MINIX_NUM 0
|
||||
#endif
|
||||
|
||||
#ifndef NUM_FSYS
|
||||
#define NUM_FSYS ( FSYS_FFS_NUM + FSYS_FAT_NUM + FSYS_EXT2FS_NUM )
|
||||
#define NUM_FSYS \
|
||||
(FSYS_FFS_NUM + FSYS_FAT_NUM + FSYS_EXT2FS_NUM + FSYS_MINIX_NUM)
|
||||
#endif
|
||||
|
||||
/* defines for the block filesystem info area */
|
||||
|
||||
@@ -0,0 +1,524 @@
|
||||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 1999 Free Software Foundation, Inc.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
/* Restrictions:
|
||||
This is MINIX V1 only (yet)
|
||||
Disk creation is like:
|
||||
mkfs.minix -c -n14 DEVICE
|
||||
*/
|
||||
|
||||
#ifdef FSYS_MINIX
|
||||
|
||||
#include "shared.h"
|
||||
#include "filesys.h"
|
||||
|
||||
/* #define DEBUG_MINIX */
|
||||
|
||||
/* indirect blocks */
|
||||
static int mapblock1, mapblock2;
|
||||
|
||||
/* sizes are always in bytes, BLOCK values are always in DEV_BSIZE (sectors) */
|
||||
#define DEV_BSIZE 512
|
||||
|
||||
/* include/linux/fs.h */
|
||||
#define BLOCK_SIZE_BITS 10
|
||||
#define BLOCK_SIZE (1<<BLOCK_SIZE_BITS)
|
||||
|
||||
/* made up, defaults to 1 but can be passed via mount_opts */
|
||||
#define WHICH_SUPER 1
|
||||
/* kind of from fs/ext2/super.c (is OK for minix) */
|
||||
#define SBLOCK (WHICH_SUPER * BLOCK_SIZE / DEV_BSIZE) /* = 2 */
|
||||
|
||||
/* include/asm-i386/type.h */
|
||||
typedef __signed__ char __s8;
|
||||
typedef unsigned char __u8;
|
||||
typedef __signed__ short __s16;
|
||||
typedef unsigned short __u16;
|
||||
typedef __signed__ int __s32;
|
||||
typedef unsigned int __u32;
|
||||
|
||||
/* include/linux/minix_fs.h */
|
||||
#define MINIX_ROOT_INO 1
|
||||
|
||||
/* Not the same as the bogus LINK_MAX in <linux/limits.h>. Oh well. */
|
||||
#define MINIX_LINK_MAX 250
|
||||
#define MINIX2_LINK_MAX 65530
|
||||
|
||||
#define MINIX_I_MAP_SLOTS 8
|
||||
#define MINIX_Z_MAP_SLOTS 64
|
||||
#define MINIX_SUPER_MAGIC 0x137F /* original minix fs */
|
||||
#define MINIX_SUPER_MAGIC2 0x138F /* minix fs, 30 char names */
|
||||
#define MINIX2_SUPER_MAGIC 0x2468 /* minix V2 fs */
|
||||
#define MINIX2_SUPER_MAGIC2 0x2478 /* minix V2 fs, 30 char names */
|
||||
#define MINIX_VALID_FS 0x0001 /* Clean fs. */
|
||||
#define MINIX_ERROR_FS 0x0002 /* fs has errors. */
|
||||
|
||||
#define MINIX_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix_inode)))
|
||||
#define MINIX2_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix2_inode)))
|
||||
|
||||
#define MINIX_V1 0x0001 /* original minix fs */
|
||||
#define MINIX_V2 0x0002 /* minix V2 fs */
|
||||
|
||||
/* originally this is :
|
||||
#define INODE_VERSION(inode) inode->i_sb->u.minix_sb.s_version
|
||||
here we have */
|
||||
#define INODE_VERSION(inode) (SUPERBLOCK->s_version)
|
||||
|
||||
#define MINIX_NAME_LEN 14 /* XXX depend on version */
|
||||
|
||||
/*
|
||||
* This is the original minix inode layout on disk.
|
||||
* Note the 8-bit gid and atime and ctime.
|
||||
*/
|
||||
struct minix_inode {
|
||||
__u16 i_mode;
|
||||
__u16 i_uid;
|
||||
__u32 i_size;
|
||||
__u32 i_time;
|
||||
__u8 i_gid;
|
||||
__u8 i_nlinks;
|
||||
__u16 i_zone[9];
|
||||
};
|
||||
|
||||
/*
|
||||
* The new minix inode has all the time entries, as well as
|
||||
* long block numbers and a third indirect block (7+1+1+1
|
||||
* instead of 7+1+1). Also, some previously 8-bit values are
|
||||
* now 16-bit. The inode is now 64 bytes instead of 32.
|
||||
*/
|
||||
struct minix2_inode {
|
||||
__u16 i_mode;
|
||||
__u16 i_nlinks;
|
||||
__u16 i_uid;
|
||||
__u16 i_gid;
|
||||
__u32 i_size;
|
||||
__u32 i_atime;
|
||||
__u32 i_mtime;
|
||||
__u32 i_ctime;
|
||||
__u32 i_zone[10];
|
||||
};
|
||||
|
||||
/*
|
||||
* minix super-block data on disk
|
||||
*/
|
||||
struct minix_super_block {
|
||||
__u16 s_ninodes;
|
||||
__u16 s_nzones;
|
||||
__u16 s_imap_blocks;
|
||||
__u16 s_zmap_blocks;
|
||||
__u16 s_firstdatazone;
|
||||
__u16 s_log_zone_size;
|
||||
__u32 s_max_size;
|
||||
__u16 s_magic;
|
||||
__u16 s_state;
|
||||
__u32 s_zones;
|
||||
};
|
||||
|
||||
struct minix_dir_entry {
|
||||
__u16 inode;
|
||||
char name[0];
|
||||
};
|
||||
|
||||
/* made up, these are pointers into FSYS_BUF */
|
||||
/* read once, always stays there: */
|
||||
#define SUPERBLOCK \
|
||||
((struct minix_super_block *)(FSYS_BUF))
|
||||
#define INODE \
|
||||
((struct minix_inode *)((int) SUPERBLOCK + BLOCK_SIZE))
|
||||
#define DATABLOCK1 \
|
||||
((int)((int)INODE + sizeof(struct minix_inode)))
|
||||
#define DATABLOCK2 \
|
||||
((int)((int)DATABLOCK1 + BLOCK_SIZE))
|
||||
|
||||
/* linux/stat.h */
|
||||
#define S_IFMT 00170000
|
||||
#define S_IFLNK 0120000
|
||||
#define S_IFREG 0100000
|
||||
#define S_IFDIR 0040000
|
||||
#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
|
||||
#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
|
||||
#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
|
||||
|
||||
#define PATH_MAX 1024 /* include/linux/limits.h */
|
||||
#define MAX_LINK_COUNT 5 /* number of symbolic links to follow */
|
||||
|
||||
/* check filesystem types and read superblock into memory buffer */
|
||||
int
|
||||
minix_mount (void)
|
||||
{
|
||||
int retval = 1;
|
||||
|
||||
if ((((current_drive & 0x80 || current_slice != 0))
|
||||
&& (current_slice != PC_SLICE_TYPE_MINIX)
|
||||
&& ! IS_PC_SLICE_TYPE_BSD_WITH_FS (current_slice, FS_OTHER))
|
||||
|| part_length < (SBLOCK +
|
||||
(sizeof (struct minix_super_block) / DEV_BSIZE))
|
||||
|| ! devread (SBLOCK, 0, sizeof (struct minix_super_block),
|
||||
(char *) SUPERBLOCK)
|
||||
|| SUPERBLOCK->s_magic != MINIX_SUPER_MAGIC)
|
||||
retval = 0;
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
/* Takes a file system block number and reads it into BUFFER. */
|
||||
static int
|
||||
minix_rdfsb (int fsblock, int buffer)
|
||||
{
|
||||
return devread (fsblock * (BLOCK_SIZE / DEV_BSIZE), 0,
|
||||
BLOCK_SIZE, (char *) buffer);
|
||||
}
|
||||
|
||||
/* Maps LOGICAL_BLOCK (the file offset divided by the blocksize) into
|
||||
a physical block (the location in the file system) via an inode. */
|
||||
static int
|
||||
minix_block_map (int logical_block)
|
||||
{
|
||||
int i;
|
||||
|
||||
if (logical_block < 7)
|
||||
return INODE->i_zone[logical_block];
|
||||
|
||||
logical_block -= 7;
|
||||
if (logical_block < 512)
|
||||
{
|
||||
i = INODE->i_zone[7];
|
||||
|
||||
if (!i || ((mapblock1 != 1)
|
||||
&& !minix_rdfsb (i, DATABLOCK1)))
|
||||
{
|
||||
errnum = ERR_FSYS_CORRUPT;
|
||||
return -1;
|
||||
}
|
||||
mapblock1 = 1;
|
||||
return ((__u16 *) DATABLOCK1) [logical_block];
|
||||
}
|
||||
|
||||
logical_block -= 512;
|
||||
i = INODE->i_zone[8];
|
||||
if (!i || ((mapblock1 != 2)
|
||||
&& !minix_rdfsb (i, DATABLOCK1)))
|
||||
{
|
||||
errnum = ERR_FSYS_CORRUPT;
|
||||
return -1;
|
||||
}
|
||||
mapblock1 = 2;
|
||||
i = ((__u16 *) DATABLOCK1)[logical_block >> 9];
|
||||
if (!i || ((mapblock2 != i)
|
||||
&& !minix_rdfsb (i, DATABLOCK2)))
|
||||
{
|
||||
errnum = ERR_FSYS_CORRUPT;
|
||||
return -1;
|
||||
}
|
||||
mapblock2 = i;
|
||||
return ((__u16 *) DATABLOCK2)[logical_block & 511];
|
||||
}
|
||||
|
||||
/* read from INODE into BUF */
|
||||
int
|
||||
minix_read (char *buf, int len)
|
||||
{
|
||||
int logical_block;
|
||||
int offset;
|
||||
int map;
|
||||
int ret = 0;
|
||||
int size = 0;
|
||||
|
||||
while (len > 0)
|
||||
{
|
||||
/* find the (logical) block component of our location */
|
||||
logical_block = filepos >> BLOCK_SIZE_BITS;
|
||||
offset = filepos & (BLOCK_SIZE - 1);
|
||||
map = minix_block_map (logical_block);
|
||||
#ifdef DEBUG_MINIX
|
||||
printf ("map=%d\n", map);
|
||||
#endif
|
||||
if (map < 0)
|
||||
break;
|
||||
|
||||
size = BLOCK_SIZE;
|
||||
size -= offset;
|
||||
if (size > len)
|
||||
size = len;
|
||||
|
||||
#ifndef STAGE1_5
|
||||
debug_fs_func = debug_fs;
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
devread (map * (BLOCK_SIZE / DEV_BSIZE),
|
||||
offset, size, buf);
|
||||
|
||||
#ifndef STAGE1_5
|
||||
debug_fs_func = NULL;
|
||||
#endif /* STAGE1_5 */
|
||||
|
||||
buf += size;
|
||||
len -= size;
|
||||
filepos += size;
|
||||
ret += size;
|
||||
}
|
||||
|
||||
if (errnum)
|
||||
ret = 0;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* preconditions: minix_mount already executed, therefore supblk in buffer
|
||||
known as SUPERBLOCK
|
||||
returns: 0 if error, nonzero iff we were able to find the file successfully
|
||||
postconditions: on a nonzero return, buffer known as INODE contains the
|
||||
inode of the file we were trying to look up
|
||||
side effects: none yet */
|
||||
int
|
||||
minix_dir (char *dirname)
|
||||
{
|
||||
int current_ino = MINIX_ROOT_INO; /* start at the root */
|
||||
int updir_ino = current_ino; /* the parent of the current directory */
|
||||
int ino_blk; /* fs pointer of the inode's info */
|
||||
|
||||
int str_chk; /* used ot hold the results of a string
|
||||
compare */
|
||||
|
||||
struct minix_inode * raw_inode; /* inode info for current_ino */
|
||||
|
||||
char linkbuf[PATH_MAX]; /* buffer for following sym-links */
|
||||
int link_count = 0;
|
||||
|
||||
char * rest;
|
||||
char ch;
|
||||
|
||||
int off; /* offset within block of directory
|
||||
entry */
|
||||
int loc; /* location within a directory */
|
||||
int blk; /* which data blk within dir entry */
|
||||
long map; /* fs pointer of a particular block from
|
||||
dir entry */
|
||||
struct minix_dir_entry * dp; /* pointer to directory entry */
|
||||
|
||||
/* loop invariants:
|
||||
current_ino = inode to lookup
|
||||
dirname = pointer to filename component we are cur looking up within
|
||||
the directory known pointed to by current_ino (if any) */
|
||||
|
||||
#ifdef DEBUG_MINIX
|
||||
printf ("\n");
|
||||
#endif
|
||||
|
||||
while (1)
|
||||
{
|
||||
#ifdef DEBUG_MINIX
|
||||
printf ("inode %d, dirname %s\n", current_ino, dirname);
|
||||
#endif
|
||||
|
||||
ino_blk = (2 + SUPERBLOCK->s_imap_blocks + SUPERBLOCK->s_zmap_blocks
|
||||
+ (current_ino - 1) / MINIX_INODES_PER_BLOCK);
|
||||
if (! minix_rdfsb (ino_blk, (int) INODE))
|
||||
return 0;
|
||||
|
||||
/* reset indirect blocks! */
|
||||
mapblock2 = mapblock1 = -1;
|
||||
|
||||
raw_inode = INODE + ((current_ino - 1) % MINIX_INODES_PER_BLOCK);
|
||||
|
||||
/* copy inode to fixed location */
|
||||
memmove ((void *) INODE, (void *) raw_inode,
|
||||
sizeof (struct minix_inode));
|
||||
|
||||
/* If we've got a symbolic link, then chase it. */
|
||||
if (S_ISLNK (INODE->i_mode))
|
||||
{
|
||||
int len;
|
||||
|
||||
if (++link_count > MAX_LINK_COUNT)
|
||||
{
|
||||
errnum = ERR_SYMLINK_LOOP;
|
||||
return 0;
|
||||
}
|
||||
#ifdef DEBUG_MINIX
|
||||
printf ("S_ISLNK (%s)\n", dirname);
|
||||
#endif
|
||||
|
||||
/* Find out how long our remaining name is. */
|
||||
len = 0;
|
||||
while (dirname[len] && !isspace (dirname[len]))
|
||||
len++;
|
||||
|
||||
/* Get the symlink size. */
|
||||
filemax = (INODE->i_size);
|
||||
if (filemax + len > sizeof (linkbuf) - 2)
|
||||
{
|
||||
errnum = ERR_FILELENGTH;
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (len)
|
||||
{
|
||||
/* Copy the remaining name to the end of the symlink data.
|
||||
Note that DIRNAME and LINKBUF may overlap! */
|
||||
memmove (linkbuf + filemax, dirname, len);
|
||||
}
|
||||
linkbuf[filemax + len] = '\0';
|
||||
|
||||
/* Read the necessary blocks, and reset the file pointer. */
|
||||
len = grub_read (linkbuf, filemax);
|
||||
filepos = 0;
|
||||
if (!len)
|
||||
return 0;
|
||||
|
||||
#ifdef DEBUG_MINIX
|
||||
printf ("symlink=%s\n", linkbuf);
|
||||
#endif
|
||||
|
||||
dirname = linkbuf;
|
||||
if (*dirname == '/')
|
||||
{
|
||||
/* It's an absolute link, so look it up in root. */
|
||||
current_ino = MINIX_ROOT_INO;
|
||||
updir_ino = current_ino;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Relative, so look it up in our parent directory. */
|
||||
current_ino = updir_ino;
|
||||
}
|
||||
|
||||
/* Try again using the new name. */
|
||||
continue;
|
||||
}
|
||||
|
||||
/* If end of filename, INODE points to the file's inode */
|
||||
if (!*dirname || isspace (*dirname))
|
||||
{
|
||||
if (!S_ISREG (INODE->i_mode))
|
||||
{
|
||||
errnum = ERR_BAD_FILETYPE;
|
||||
return 0;
|
||||
}
|
||||
|
||||
filemax = (INODE->i_size);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* else we have to traverse a directory */
|
||||
updir_ino = current_ino;
|
||||
|
||||
/* skip over slashes */
|
||||
while (*dirname == '/')
|
||||
dirname++;
|
||||
|
||||
/* if this isn't a directory of sufficient size to hold our file,
|
||||
abort */
|
||||
if (!(INODE->i_size) || !S_ISDIR (INODE->i_mode))
|
||||
{
|
||||
errnum = ERR_BAD_FILETYPE;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* skip to next slash or end of filename (space) */
|
||||
for (rest = dirname; (ch = *rest) && !isspace (ch) && ch != '/';
|
||||
rest++);
|
||||
|
||||
/* look through this directory and find the next filename component */
|
||||
/* invariant: rest points to slash after the next filename component */
|
||||
*rest = 0;
|
||||
loc = 0;
|
||||
|
||||
do
|
||||
{
|
||||
#ifdef DEBUG_MINIX
|
||||
printf ("dirname=`%s', rest=`%s', loc=%d\n", dirname, rest, loc);
|
||||
#endif
|
||||
|
||||
/* if our location/byte offset into the directory exceeds the size,
|
||||
give up */
|
||||
if (loc >= INODE->i_size)
|
||||
{
|
||||
if (print_possibilities < 0)
|
||||
{
|
||||
putchar ('\n');
|
||||
}
|
||||
else
|
||||
{
|
||||
errnum = ERR_FILE_NOT_FOUND;
|
||||
*rest = ch;
|
||||
}
|
||||
return (print_possibilities < 0);
|
||||
}
|
||||
|
||||
/* else, find the (logical) block component of our location */
|
||||
blk = loc >> BLOCK_SIZE_BITS;
|
||||
|
||||
/* we know which logical block of the directory entry we are looking
|
||||
for, now we have to translate that to the physical (fs) block on
|
||||
the disk */
|
||||
map = minix_block_map (blk);
|
||||
#ifdef DEBUG_MINIX
|
||||
printf ("fs block=%d\n", map);
|
||||
#endif
|
||||
mapblock2 = -1;
|
||||
if ((map < 0) || !minix_rdfsb (map, DATABLOCK2))
|
||||
{
|
||||
errnum = ERR_FSYS_CORRUPT;
|
||||
*rest = ch;
|
||||
return 0;
|
||||
}
|
||||
off = loc & (BLOCK_SIZE - 1);
|
||||
dp = (struct minix_dir_entry *) (DATABLOCK2 + off);
|
||||
/* advance loc prematurely to next on-disk directory entry */
|
||||
loc += sizeof (dp->inode) + 14; /* XXX */
|
||||
|
||||
/* NOTE: minix filenames are NULL terminated if < 14 else exact */
|
||||
|
||||
#ifdef DEBUG_MINIX
|
||||
printf ("directory entry ino=%d\n", dp->inode);
|
||||
if (dp->inode)
|
||||
printf ("entry=%s\n", dp->name);
|
||||
#endif
|
||||
|
||||
if (dp->inode)
|
||||
{
|
||||
int saved_c = dp->name[MINIX_NAME_LEN+1];
|
||||
|
||||
dp->name[MINIX_NAME_LEN+1] = 0;
|
||||
str_chk = substring (dirname, dp->name);
|
||||
|
||||
# ifndef STAGE1_5
|
||||
if (print_possibilities && ch != '/'
|
||||
&& (!*dirname || str_chk <= 0))
|
||||
{
|
||||
if (print_possibilities > 0)
|
||||
print_possibilities = -print_possibilities;
|
||||
print_a_completion (dp->name);
|
||||
}
|
||||
# endif
|
||||
|
||||
dp->name[MINIX_NAME_LEN+1] = saved_c;
|
||||
}
|
||||
|
||||
}
|
||||
while (!dp->inode || (str_chk || (print_possibilities && ch != '/')));
|
||||
|
||||
current_ino = dp->inode;
|
||||
*(dirname = rest) = ch;
|
||||
}
|
||||
/* never get here */
|
||||
}
|
||||
|
||||
#endif /* FSYS_MINIX */
|
||||
@@ -106,6 +106,7 @@
|
||||
#define PC_SLICE_TYPE_FAT32_LBA 0xc
|
||||
#define PC_SLICE_TYPE_FAT16_LBA 0xe
|
||||
#define PC_SLICE_TYPE_WIN95_EXTENDED 0xf
|
||||
#define PC_SLICE_TYPE_MINIX 0x80
|
||||
#define PC_SLICE_TYPE_EXT2FS 0x83
|
||||
|
||||
/* For convinience. */
|
||||
|
||||
+17
-14
@@ -130,23 +130,26 @@ extern char *grub_scratch_mem;
|
||||
#define STAGE2_VER_STR_OFFS 0xd
|
||||
|
||||
/* Stage 2 identifiers */
|
||||
#define STAGE2_ID_STAGE2 0
|
||||
#define STAGE2_ID_FFS_STAGE1_5 1
|
||||
#define STAGE2_ID_E2FS_STAGE1_5 2
|
||||
#define STAGE2_ID_FAT_STAGE1_5 3
|
||||
#define STAGE2_ID_STAGE2 0
|
||||
#define STAGE2_ID_FFS_STAGE1_5 1
|
||||
#define STAGE2_ID_E2FS_STAGE1_5 2
|
||||
#define STAGE2_ID_FAT_STAGE1_5 3
|
||||
#define STAGE2_ID_MINIX_STAGE1_5 4
|
||||
|
||||
#ifndef STAGE1_5
|
||||
#define STAGE2_ID STAGE2_ID_STAGE2
|
||||
# define STAGE2_ID STAGE2_ID_STAGE2
|
||||
#else
|
||||
#if defined(FSYS_FFS)
|
||||
#define STAGE2_ID STAGE2_ID_FFS_STAGE1_5
|
||||
#elif defined(FSYS_EXT2FS)
|
||||
#define STAGE2_ID STAGE2_ID_E2FS_STAGE1_5
|
||||
#elif defined(FSYS_FAT)
|
||||
#define STAGE2_ID STAGE2_ID_FAT_STAGE1_5
|
||||
#else
|
||||
#error "unknown Stage 2"
|
||||
#endif
|
||||
# if defined(FSYS_FFS)
|
||||
# define STAGE2_ID STAGE2_ID_FFS_STAGE1_5
|
||||
# elif defined(FSYS_EXT2FS)
|
||||
# define STAGE2_ID STAGE2_ID_E2FS_STAGE1_5
|
||||
# elif defined(FSYS_FAT)
|
||||
# define STAGE2_ID STAGE2_ID_FAT_STAGE1_5
|
||||
# elif defined(FSYS_MINIX)
|
||||
# define STAGE2_ID STAGE2_ID_MINIX_STAGE1_5
|
||||
# else
|
||||
# error "unknown Stage 2"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
||||
@@ -47,6 +47,9 @@ check fat_stage1_5 31744
|
||||
# Likewise.
|
||||
check e2fs_stage1_5 31744
|
||||
|
||||
# Likewise.
|
||||
check minix_stage1_5 31744
|
||||
|
||||
# This limitation is arbitrary; If you want to make this larger, just
|
||||
# modify Stage 1.
|
||||
check stage2 46080
|
||||
|
||||
Reference in new issue
Block a user