From 6c20f632b688dbfcce291a62511cc94ad8019e64 Mon Sep 17 00:00:00 2001 From: zhanghongtao Date: Wed, 15 Mar 2023 15:54:41 +0800 Subject: [PATCH] Fix mattrib does not work (cherry picked from commit 2a235bd02a27b19ef7f3d90a404c2158cfe69507) --- 0002-Fix-mattrib-does-not-work.patch | 37 ++++++++++++++++++++++++++++ mtools.spec | 6 ++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 0002-Fix-mattrib-does-not-work.patch diff --git a/0002-Fix-mattrib-does-not-work.patch b/0002-Fix-mattrib-does-not-work.patch new file mode 100644 index 0000000..7c88d66 --- /dev/null +++ b/0002-Fix-mattrib-does-not-work.patch @@ -0,0 +1,37 @@ +From ce3f4f86d62e9fe54850b1dbfe37641eb41e94b7 Mon Sep 17 00:00:00 2001 +From: Hongtao +Date: Tue, 14 Mar 2023 16:25:45 +0800 +Subject: [PATCH] Fix mattrib does not work + +For example: + +#mattrib +r tmp_dos_test +#echo $? +0 +#mattrib tmp_dos_test + A A:/tmp_dos_test + +mattrib didn't work. +We found that the judgment in the attrib_file function was incorrect. + +Signed-off-by: Hongtao Zhang +--- + mattrib.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mattrib.c b/mattrib.c +index 29ef1da..e5cac78 100644 +--- a/mattrib.c ++++ b/mattrib.c +@@ -34,7 +34,7 @@ static int attrib_file(direntry_t *entry, MainParam_t *mp) + { + Arg_t *arg=(Arg_t *) mp->arg; + +- if(isRootEntry(entry)) { ++ if(!isRootEntry(entry)) { + /* if not root directory, change it */ + entry->dir.attr = (entry->dir.attr & arg->remove) | arg->add; + dir_write(entry); +-- +2.39.1 + diff --git a/mtools.spec b/mtools.spec index ad69841..4a1b8f3 100644 --- a/mtools.spec +++ b/mtools.spec @@ -1,6 +1,6 @@ Name: mtools Version: 4.0.42 -Release: 1 +Release: 2 Summary: Collection of utilities to access MS-DOS disks License: GPLv3+ URL: http://www.gnu.org/software/mtools/ @@ -10,6 +10,7 @@ Source0: ftp://ftp.gnu.org/gnu/mtools/mtools-%{version}.tar.bz2 BuildRequires: gcc texinfo autoconf automake Patch1: 0001-comment-invalid-info-in-conf-file.patch +Patch2: 0002-Fix-mattrib-does-not-work.patch %description Mtools is a collection of utilities to access MS-DOS disks from GNU @@ -55,6 +56,9 @@ ln -s mtools.5.gz %{buildroot}%{_mandir}/man5/mtools.conf.5.gz %{_infodir}/mtools.info* %changelog +* Wed Mar 15 2023 Hongtao Zhang - 4.0.42-2 +- Fix mattrib does not work + * Wed Feb 8 2023 Hongtao Zhang - 4.0.42-1 - update mtools version to 4.0.42 -- Gitee