From 6d87cb3980f614050e79120aedf4b20cef7fb8e2 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Mon, 26 Aug 2024 13:47:01 +0000 Subject: [PATCH] minor fixes --- mmgen/filename.py | 4 ++-- mmgen/fileutil.py | 3 ++- test/tooltest2.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mmgen/filename.py b/mmgen/filename.py index fe703f1c..6c3e0e15 100755 --- a/mmgen/filename.py +++ b/mmgen/filename.py @@ -42,9 +42,9 @@ class File: import stat if stat.S_ISBLK(st.st_mode): + if sys.platform in ('win32',): + die(2, 'Access to raw block devices not supported on platform {sys.platform!r}') mode = (os.O_RDONLY,os.O_RDWR)[bool(write)] - if sys.platform == 'win32': - mode |= os.O_BINARY try: fd = os.open(fn, mode) except OSError as e: diff --git a/mmgen/fileutil.py b/mmgen/fileutil.py index 57926d0e..be8beaa7 100755 --- a/mmgen/fileutil.py +++ b/mmgen/fileutil.py @@ -86,7 +86,8 @@ def _check_file_type_and_access(fname,ftype,blkdev_ok=False): (stat.S_ISLNK,'symbolic link') ] if blkdev_ok: - ok_types.append((stat.S_ISBLK,'block device')) + if not sys.platform in ('win32',): + ok_types.append((stat.S_ISBLK, 'block device')) try: mode = os.stat(fname).st_mode diff --git a/test/tooltest2.py b/test/tooltest2.py index 5a9c8797..302b1f30 100755 --- a/test/tooltest2.py +++ b/test/tooltest2.py @@ -345,5 +345,5 @@ if cfg.fork: from mmgen.main import launch start_time = int(time.time()) -launch(func=lambda: main()) +launch(func=main) end_msg(int(time.time()) - start_time)