Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 75774: [FSUTIL] Implement fsutil fsinfo drives and fsutil fsinfo drivetype
by pschweitzer＠svn.reactos.org 06 Sep '17

06 Sep '17

Author: pschweitzer Date: Wed Sep 6 15:32:02 2017 New Revision: 75774 URL: http://svn.reactos.org/svn/reactos?rev=75774&view=rev Log: [FSUTIL] Implement fsutil fsinfo drives and fsutil fsinfo drivetype Added: trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c (with props) Modified: trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c Modified: trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt [iso-8859-1] Wed Sep 6 15:32:02 2017 @@ -1,6 +1,7 @@ list(APPEND SOURCE common.c dirty.c + fsinfo.c fsutil.c fsutil.h) add_executable(fsutil ${SOURCE} fsutil.rc) Added: trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c (added) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] Wed Sep 6 15:32:02 2017 @@ -0,0 +1,109 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS FS utility tool + * FILE: base/applications/cmdutils/fsinfo.c + * PURPOSE: FSutil file systems information + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + +/* Add handlers here for subcommands */ +static int DrivesMain(int argc, const TCHAR *argv[]); +static int DriveTypeMain(int argc, const TCHAR *argv[]); +static HandlerItem HandlersList[] = +{ + /* Proc, name, help */ + { DrivesMain, _T("drives"), _T("Enumerates the drives") }, + { DriveTypeMain, _T("drivetype"), _T("Provides the type of a drive") }, +}; + +static int +DrivesMain(int argc, const TCHAR *argv[]) +{ + UINT i; + DWORD Drives; + + /* Get the drives bitmap */ + Drives = GetLogicalDrives(); + if (Drives == 0) + { + _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); + return 1; + } + + /* And output any found drive */ + _ftprintf(stdout, _T("Drives:")); + for (i = 0; i < 26; i++) + { + if (Drives & (1 << i)) + { + _ftprintf(stdout, _T(" %c:\\"), 'A' + i); + } + } + _ftprintf(stdout, _T("\n")); + + return 0; +} + +static int +DriveTypeMain(int argc, const TCHAR *argv[]) +{ + UINT Type; + + /* We need a volume (letter) */ + if (argc < 2) + { + _ftprintf(stderr, _T("Usage: fsutil fsinfo drivetype <volume>\n")); + _ftprintf(stderr, _T("\tFor example: fsutil fsinfo drivetype c:\n")); + return 1; + } + + /* Get its drive type and make it readable */ + Type = GetDriveType(argv[1]); + switch (Type) + { + case DRIVE_UNKNOWN: + _ftprintf(stdout, _T("%s - unknown drive type\n"), argv[1]); + break; + + case DRIVE_NO_ROOT_DIR: + _ftprintf(stdout, _T("%s - not a root directory\n"), argv[1]); + break; + + case DRIVE_REMOVABLE: + _ftprintf(stdout, _T("%s - removable drive\n"), argv[1]); + break; + + case DRIVE_FIXED: + _ftprintf(stdout, _T("%s - fixed drive\n"), argv[1]); + break; + + case DRIVE_REMOTE: + _ftprintf(stdout, _T("%s - remote or network drive\n"), argv[1]); + break; + + case DRIVE_CDROM: + _ftprintf(stdout, _T("%s - CD-ROM drive\n"), argv[1]); + break; + + case DRIVE_RAMDISK: + _ftprintf(stdout, _T("%s - RAM disk drive\n"), argv[1]); + break; + } + + return 0; +} + +static void +PrintUsage(const TCHAR * Command) +{ + PrintDefaultUsage(_T(" FSINFO "), Command, (HandlerItem *)&HandlersList, + (sizeof(HandlersList) / sizeof(HandlersList[0]))); +} + +int +FsInfoMain(int argc, const TCHAR *argv[]) +{ + return FindHandler(argc, argv, (HandlerItem *)&HandlersList, + (sizeof(HandlersList) / sizeof(HandlersList[0])), + PrintUsage); +} Propchange: trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c [iso-8859-1] Wed Sep 6 15:32:02 2017 @@ -10,10 +10,12 @@ /* Add handlers here for commands */ int DirtyMain(int argc, const TCHAR *argv[]); +int FsInfoMain(int argc, const TCHAR *argv[]); static HandlerItem HandlersList[] = { /* Proc, name, help */ { DirtyMain, _T("dirty"), _T("Manipulates the dirty bit") }, + { FsInfoMain, _T("fsinfo"), _T("Gathers informations about file systems") }, }; static void

1 0

[pschweitzer] 75773: [FSUTIL] Add a helper for opening a volume. Make it check for local devices if needed
by pschweitzer＠svn.reactos.org 06 Sep '17

06 Sep '17

Author: pschweitzer Date: Wed Sep 6 12:41:52 2017 New Revision: 75773 URL: http://svn.reactos.org/svn/reactos?rev=75773&view=rev Log: [FSUTIL] Add a helper for opening a volume. Make it check for local devices if needed Modified: trunk/reactos/base/applications/cmdutils/fsutil/common.c trunk/reactos/base/applications/cmdutils/fsutil/dirty.c trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h Modified: trunk/reactos/base/applications/cmdutils/fsutil/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/common.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/common.c [iso-8859-1] Wed Sep 6 12:41:52 2017 @@ -46,6 +46,39 @@ return ret; } +HANDLE OpenVolume(const TCHAR * Volume, + BOOLEAN AllowRemote) +{ + UINT Type; + HANDLE hVolume; + TCHAR VolumeID[PATH_MAX]; + + /* Create full name */ + _stprintf(VolumeID, _T("\\\\.\\%s"), Volume); + + /* Get volume type */ + if (!AllowRemote && Volume[1] == L':') + { + Type = GetDriveType(Volume); + if (Type == DRIVE_REMOTE) + { + _ftprintf(stderr, _T("FSUTIL needs a local device\n")); + return INVALID_HANDLE_VALUE; + } + } + + /* Open the volume */ + hVolume = CreateFile(VolumeID, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (hVolume == INVALID_HANDLE_VALUE) + { + _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); + return INVALID_HANDLE_VALUE; + } + + return hVolume; +} + void PrintDefaultUsage(const TCHAR * Command, const TCHAR * SubCommand, HandlerItem * HandlersList, Modified: trunk/reactos/base/applications/cmdutils/fsutil/dirty.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] Wed Sep 6 12:41:52 2017 @@ -23,7 +23,6 @@ QueryMain(int argc, const TCHAR *argv[]) { HANDLE Volume; - TCHAR VolumeID[PATH_MAX]; ULONG VolumeStatus, BytesRead; /* We need a volume (letter or GUID) */ @@ -34,15 +33,10 @@ return 1; } - /* Create full name */ - _stprintf(VolumeID, _T("\\\\.\\%s"), argv[1]); - - /* Open the volume */ - Volume = CreateFile(VolumeID, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + /* Get a handle for the volume */ + Volume = OpenVolume(argv[1], FALSE); if (Volume == INVALID_HANDLE_VALUE) { - _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); return 1; } @@ -68,7 +62,6 @@ { HANDLE Volume; DWORD BytesRead; - TCHAR VolumeID[PATH_MAX]; /* We need a volume (letter or GUID) */ if (argc < 2) @@ -78,15 +71,10 @@ return 1; } - /* Create full name */ - _stprintf(VolumeID, _T("\\\\.\\%s"), argv[1]); - - /* Open the volume */ - Volume = CreateFile(VolumeID, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + /* Get a handle for the volume */ + Volume = OpenVolume(argv[1], FALSE); if (Volume == INVALID_HANDLE_VALUE) { - _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); return 1; } Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h [iso-8859-1] Wed Sep 6 12:41:52 2017 @@ -18,6 +18,9 @@ int HandlerListCount, void (*UsageHelper)(const TCHAR *)); +HANDLE OpenVolume(const TCHAR * Volume, + BOOLEAN AllowRemote); + void PrintDefaultUsage(const TCHAR * Command, const TCHAR * SubCommand, HandlerItem * HandlersList,

1 0

[pschweitzer] 75772: [FASTFAT] Don't decrease the open handle count too much (in cleanup & close). This avoid overflow and allows correct openings count
by pschweitzer＠svn.reactos.org 06 Sep '17

06 Sep '17

Author: pschweitzer Date: Wed Sep 6 11:49:30 2017 New Revision: 75772 URL: http://svn.reactos.org/svn/reactos?rev=75772&view=rev Log: [FASTFAT] Don't decrease the open handle count too much (in cleanup & close). This avoid overflow and allows correct openings count Modified: trunk/reactos/drivers/filesystems/fastfat/close.c Modified: trunk/reactos/drivers/filesystems/fastfat/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/close.c [iso-8859-1] Wed Sep 6 11:49:30 2017 @@ -52,7 +52,6 @@ FileObject->FsContext2 = NULL; FileObject->FsContext = NULL; FileObject->SectionObjectPointer = NULL; - DeviceExt->OpenHandleCount--; if (pCcb) {

1 0

[pschweitzer] 75771: [FASTFAT] Don't return uninit status on allocation failure.
by pschweitzer＠svn.reactos.org 06 Sep '17

06 Sep '17

Author: pschweitzer Date: Wed Sep 6 11:48:42 2017 New Revision: 75771 URL: http://svn.reactos.org/svn/reactos?rev=75771&view=rev Log: [FASTFAT] Don't return uninit status on allocation failure. Modified: trunk/reactos/drivers/filesystems/fastfat/shutdown.c Modified: trunk/reactos/drivers/filesystems/fastfat/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/shutdown.c [iso-8859-1] Wed Sep 6 11:48:42 2017 @@ -39,7 +39,7 @@ } else { - Status = IoStatus.Status; + Status = STATUS_INSUFFICIENT_RESOURCES; } return Status;

1 0

[jimtabor] 75770: [Shell32] - Patch by Fabian Maurer : Draw text on message boxes without background. - Fixes CORE-13742.
by jimtabor＠svn.reactos.org 06 Sep '17

06 Sep '17

Author: jimtabor Date: Wed Sep 6 05:33:35 2017 New Revision: 75770 URL: http://svn.reactos.org/svn/reactos?rev=75770&view=rev Log: [Shell32] - Patch by Fabian Maurer : Draw text on message boxes without background. - Fixes CORE-13742. Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Wed Sep 6 05:33:35 2017 @@ -130,6 +130,7 @@ BeginPaint(hDlg, &ps); hdc = ps.hdc; + SetBkMode(hdc, TRANSPARENT); GetClientRect(GetDlgItem(hDlg, IDC_YESTOALL_MESSAGE), &r); /* this will remap the rect to dialog coords */

1 0

[pschweitzer] 75769: [PSDK] Define FSCTL_MARK_VOLUME_DIRTY. This fixes build (erm)
by pschweitzer＠svn.reactos.org 05 Sep '17

05 Sep '17

Author: pschweitzer Date: Tue Sep 5 19:19:22 2017 New Revision: 75769 URL: http://svn.reactos.org/svn/reactos?rev=75769&view=rev Log: [PSDK] Define FSCTL_MARK_VOLUME_DIRTY. This fixes build (erm) Modified: trunk/reactos/sdk/include/psdk/winioctl.h Modified: trunk/reactos/sdk/include/psdk/winioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winioctl.… ============================================================================== --- trunk/reactos/sdk/include/psdk/winioctl.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/winioctl.h [iso-8859-1] Tue Sep 5 19:19:22 2017 @@ -630,6 +630,7 @@ #ifndef _FILESYSTEMFSCTL_ #define _FILESYSTEMFSCTL_ +#define FSCTL_MARK_VOLUME_DIRTY CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 12, METHOD_BUFFERED, FILE_ANY_ACCESS) #if (_WIN32_WINNT >= _WIN32_WINNT_NT4) #define FSCTL_IS_VOLUME_DIRTY CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 30, METHOD_BUFFERED, FILE_ANY_ACCESS) #endif

1 0

[pschweitzer] 75768: [FSUTIL] Implement setting the dirty bit (fsutil dirty set) on a volume. This doesn't allow to trigger a chkdsk on reboot with ReactOS, because of the way we handle the dirty b...
by pschweitzer＠svn.reactos.org 05 Sep '17

05 Sep '17

Author: pschweitzer Date: Tue Sep 5 19:11:02 2017 New Revision: 75768 URL: http://svn.reactos.org/svn/reactos?rev=75768&view=rev Log: [FSUTIL] Implement setting the dirty bit (fsutil dirty set) on a volume. This doesn't allow to trigger a chkdsk on reboot with ReactOS, because of the way we handle the dirty bit in our FAT implementation is a bit... weird. This works on W2K3 though! Modified: trunk/reactos/base/applications/cmdutils/fsutil/dirty.c Modified: trunk/reactos/base/applications/cmdutils/fsutil/dirty.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] Tue Sep 5 19:11:02 2017 @@ -60,15 +60,50 @@ /* Print the status */ _ftprintf(stdout, _T("The %s volume is %s\n"), argv[1], (VolumeStatus & VOLUME_IS_DIRTY ? _T("dirty") : _T("clean"))); - return 1; + return 0; } static int SetMain(int argc, const TCHAR *argv[]) { - /* FIXME */ - _ftprintf(stderr, _T("Not implemented\n")); - return 1; + HANDLE Volume; + DWORD BytesRead; + TCHAR VolumeID[PATH_MAX]; + + /* We need a volume (letter or GUID) */ + if (argc < 2) + { + _ftprintf(stderr, _T("Usage: fsutil dirty set <volume>\n")); + _ftprintf(stderr, _T("\tFor example: fsutil dirty set c:\n")); + return 1; + } + + /* Create full name */ + _stprintf(VolumeID, _T("\\\\.\\%s"), argv[1]); + + /* Open the volume */ + Volume = CreateFile(VolumeID, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (Volume == INVALID_HANDLE_VALUE) + { + _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); + return 1; + } + + /* And set the dirty bit */ + if (DeviceIoControl(Volume, FSCTL_MARK_VOLUME_DIRTY, NULL, 0, NULL, 0, &BytesRead, NULL) == FALSE) + { + _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); + CloseHandle(Volume); + return 1; + } + + CloseHandle(Volume); + + /* Print the status */ + _ftprintf(stdout, _T("The %s volume is now marked as dirty\n"), argv[1]); + + return 0; } static void

1 0

[pschweitzer] 75767: [FASTFAT] Fix a bug: - IRP information was never set in VfatIsVolumeDirty() and thus dirty status was never copied back to the caller
by pschweitzer＠svn.reactos.org 05 Sep '17

05 Sep '17

Author: pschweitzer Date: Tue Sep 5 19:08:01 2017 New Revision: 75767 URL: http://svn.reactos.org/svn/reactos?rev=75767&view=rev Log: [FASTFAT] Fix a bug: - IRP information was never set in VfatIsVolumeDirty() and thus dirty status was never copied back to the caller Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Tue Sep 5 19:08:01 2017 @@ -1021,6 +1021,8 @@ *Flags |= VOLUME_IS_DIRTY; } + IrpContext->Irp->IoStatus.Information = sizeof(ULONG); + return STATUS_SUCCESS; }

1 0

[pschweitzer] 75766: [FSUTIL] Avoid code duplication++
by pschweitzer＠svn.reactos.org 05 Sep '17

05 Sep '17

Author: pschweitzer Date: Tue Sep 5 13:24:00 2017 New Revision: 75766 URL: http://svn.reactos.org/svn/reactos?rev=75766&view=rev Log: [FSUTIL] Avoid code duplication++ Modified: trunk/reactos/base/applications/cmdutils/fsutil/common.c trunk/reactos/base/applications/cmdutils/fsutil/dirty.c trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h Modified: trunk/reactos/base/applications/cmdutils/fsutil/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/common.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/common.c [iso-8859-1] Tue Sep 5 13:24:00 2017 @@ -45,3 +45,24 @@ return ret; } + +void PrintDefaultUsage(const TCHAR * Command, + const TCHAR * SubCommand, + HandlerItem * HandlersList, + int HandlerListCount) +{ + int i; + + /* If we were given a command, print it's not supported */ + if (SubCommand != NULL) + { + _ftprintf(stderr, _T("Unhandled%scommand: %s\n"), Command, SubCommand); + } + + /* And dump any available command */ + _ftprintf(stderr, _T("---- Handled%scommands ----\n\n"), Command); + for (i = 0; i < HandlerListCount; ++i) + { + _ftprintf(stderr, _T("%s\t%s\n"), HandlersList[i].Command, HandlersList[i].Desc); + } +} Modified: trunk/reactos/base/applications/cmdutils/fsutil/dirty.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] Tue Sep 5 13:24:00 2017 @@ -74,20 +74,8 @@ static void PrintUsage(const TCHAR * Command) { - int i; - - /* If we were given a command, print it's not supported */ - if (Command != NULL) - { - _ftprintf(stderr, _T("Unhandled DIRTY command: %s\n"), Command); - } - - /* And dump any available command */ - _ftprintf(stderr, _T("---- Handled DIRTY commands ----\n\n")); - for (i = 0; i < (sizeof(HandlersList) / sizeof(HandlersList[0])); ++i) - { - _ftprintf(stderr, _T("%s\t%s\n"), HandlersList[i].Command, HandlersList[i].Desc); - } + PrintDefaultUsage(_T(" DIRTY "), Command, (HandlerItem *)&HandlersList, + (sizeof(HandlersList) / sizeof(HandlersList[0]))); } int Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c [iso-8859-1] Tue Sep 5 13:24:00 2017 @@ -19,20 +19,8 @@ static void PrintUsage(const TCHAR * Command) { - int i; - - /* If we were given a command, print it's not supported */ - if (Command != NULL) - { - _ftprintf(stderr, _T("Unhandled command: %s\n"), Command); - } - - /* And dump any available command */ - _ftprintf(stderr, _T("---- Handled commands ----\n\n")); - for (i = 0; i < (sizeof(HandlersList) / sizeof(HandlersList[0])); ++i) - { - _ftprintf(stderr, _T("%s\t%s\n"), HandlersList[i].Command, HandlersList[i].Desc); - } + PrintDefaultUsage(_T(" "), Command, (HandlerItem *)&HandlersList, + (sizeof(HandlersList) / sizeof(HandlersList[0]))); } int Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h [iso-8859-1] Tue Sep 5 13:24:00 2017 @@ -18,4 +18,9 @@ int HandlerListCount, void (*UsageHelper)(const TCHAR *)); +void PrintDefaultUsage(const TCHAR * Command, + const TCHAR * SubCommand, + HandlerItem * HandlersList, + int HandlerListCount); + #endif

1 0

[pschweitzer] 75765: [FSUTIL] Avoid code duplication
by pschweitzer＠svn.reactos.org 05 Sep '17

05 Sep '17

Author: pschweitzer Date: Tue Sep 5 13:10:16 2017 New Revision: 75765 URL: http://svn.reactos.org/svn/reactos?rev=75765&view=rev Log: [FSUTIL] Avoid code duplication Added: trunk/reactos/base/applications/cmdutils/fsutil/common.c (with props) Modified: trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt trunk/reactos/base/applications/cmdutils/fsutil/dirty.c trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h Modified: trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/CMakeLists.txt [iso-8859-1] Tue Sep 5 13:10:16 2017 @@ -1,4 +1,5 @@ list(APPEND SOURCE + common.c dirty.c fsutil.c fsutil.h) Added: trunk/reactos/base/applications/cmdutils/fsutil/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/common.c (added) +++ trunk/reactos/base/applications/cmdutils/fsutil/common.c [iso-8859-1] Tue Sep 5 13:10:16 2017 @@ -0,0 +1,47 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS FS utility tool + * FILE: base/applications/cmdutils/common.c + * PURPOSE: FSutil common functions + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include "fsutil.h" + +int FindHandler(int argc, + const TCHAR *argv[], + HandlerItem * HandlersList, + int HandlerListCount, + void (*UsageHelper)(const TCHAR *)) +{ + int i; + int ret; + const TCHAR * Command; + + ret = 1; + Command = NULL; + i = HandlerListCount; + + /* If we have a command, does it match a known one? */ + if (argc > 1) + { + /* Browse all the known commands finding the right one */ + Command = argv[1]; + for (i = 0; i < HandlerListCount; ++i) + { + if (_tcsicmp(Command, HandlersList[i].Command) == 0) + { + ret = HandlersList[i].Handler(argc - 1, &argv[1]); + break; + } + } + } + + /* We failed finding someone to handle the caller's needs, print out */ + if (i == HandlerListCount) + { + UsageHelper(Command); + } + + return ret; +} Propchange: trunk/reactos/base/applications/cmdutils/fsutil/common.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/fsutil/dirty.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] Tue Sep 5 13:10:16 2017 @@ -93,34 +93,7 @@ int DirtyMain(int argc, const TCHAR *argv[]) { - int i; - int ret; - const TCHAR * Command; - - ret = 1; - Command = NULL; - i = (sizeof(HandlersList) / sizeof(HandlersList[0])); - - /* If we have a command, does it match a known one? */ - if (argc > 1) - { - /* Browse all the known commands finding the right one */ - Command = argv[1]; - for (i = 0; i < (sizeof(HandlersList) / sizeof(HandlersList[0])); ++i) - { - if (_tcsicmp(Command, HandlersList[i].Command) == 0) - { - ret = HandlersList[i].Handler(argc - 1, &argv[1]); - break; - } - } - } - - /* We failed finding someone to handle the caller's needs, print out */ - if (i == (sizeof(HandlersList) / sizeof(HandlersList[0]))) - { - PrintUsage(Command); - } - - return ret; + return FindHandler(argc, argv, (HandlerItem *)&HandlersList, + (sizeof(HandlersList) / sizeof(HandlersList[0])), + PrintUsage); } Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsutil.c [iso-8859-1] Tue Sep 5 13:10:16 2017 @@ -39,34 +39,7 @@ __cdecl _tmain(int argc, const TCHAR *argv[]) { - int i; - int ret; - const TCHAR * Command; - - ret = 1; - Command = NULL; - i = (sizeof(HandlersList) / sizeof(HandlersList[0])); - - /* If we have a command, does it match a known one? */ - if (argc > 1) - { - /* Browse all the known commands finding the right one */ - Command = argv[1]; - for (i = 0; i < (sizeof(HandlersList) / sizeof(HandlersList[0])); ++i) - { - if (_tcsicmp(Command, HandlersList[i].Command) == 0) - { - ret = HandlersList[i].Handler(argc - 1, &argv[1]); - break; - } - } - } - - /* We failed finding someone to handle the caller's needs, print out */ - if (i == (sizeof(HandlersList) / sizeof(HandlersList[0]))) - { - PrintUsage(Command); - } - - return ret; + return FindHandler(argc, argv, (HandlerItem *)&HandlersList, + (sizeof(HandlersList) / sizeof(HandlersList[0])), + PrintUsage); } Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h [iso-8859-1] Tue Sep 5 13:10:16 2017 @@ -12,4 +12,10 @@ const TCHAR * Desc; } HandlerItem; +int FindHandler(int argc, + const TCHAR *argv[], + HandlerItem * HandlersList, + int HandlerListCount, + void (*UsageHelper)(const TCHAR *)); + #endif

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs