Add sources

Author: Spacetown

src/OperationCopy.c

@@ -75,7 +75,7 @@ static tResult copyOperation(void) {
             hFind = FindFirstFile(DosDevicePath, &FindFileData);
             // GCOVR_EXCL_START
             if (hFind == INVALID_HANDLE_VALUE) {
-               result = printLastError(_T("Got invalid handle for %s"), getReadableFilename(DosDevicePath));
+               result &= printLastError(_T("Got invalid handle for %s"), getReadableFilename(DosDevicePath));
             }
             // GCOVR_EXCL_STOP
             else {
@@ -93,14 +93,16 @@ static tResult copyOperation(void) {
                if (result == eOk) {
                   // GCOVR_EXCL_START
                   if (GetLastError() != ERROR_NO_MORE_FILES) {
-                     result = printLastError(_T("Can't get next file"));
+                     result &= printLastError(_T("Can't get next file"));
                   }
                   // GCOVR_EXCL_STOP
                }
 
                StartOfSourceName[-1] = _T('\0');
                // close handle to file
-               FindClose(hFind);
+               if (!FindClose(hFind)) {
+                  result &= printLastError(_T("Can't close file search handle."));
+               }
             }
          }
       } else {

src/OperationMove.c

@@ -88,7 +88,7 @@ static tResult moveOperation(void) {
                hFind = FindFirstFile(DosDevicePath, &FindFileData);
                // GCOVR_EXCL_START
                if (hFind == INVALID_HANDLE_VALUE) {
-                  result = printLastError(_T("Got invalid handle for %s"), getReadableFilename(DosDevicePath));
+                  result &= printLastError(_T("Got invalid handle for %s"), getReadableFilename(DosDevicePath));
                }
                // GCOVR_EXCL_STOP
                else {
@@ -108,16 +108,16 @@ static tResult moveOperation(void) {
                      // We are at the end of the list
                      // GCOVR_EXCL_START
                      if (GetLastError() != ERROR_NO_MORE_FILES) {
-                        result = printLastError(_T("Can't get next file"));
+                        result &= printLastError(_T("Can't get next file"));
                      }
                      // GCOVR_EXCL_STOP
-                     else {
-                        removeEmptyDirectory(DosDevicePath);
-                     }
                   }
 
                   // close handle to file
-                  FindClose(hFind);
+                  if (!FindClose(hFind)) {
+                     result &= printLastError(_T("Can't close file search handle."));
+                  }
+                  removeEmptyDirectory(DosDevicePath);
                }
             }
          }

src/OperationMove.cmake

@@ -150,10 +150,10 @@ test_fileop_check_filesystem(
 )
 
 test_fileop_check_filesystem(
-   NAME MoveFileExistingTargetDashDash
-   DEPENDS MoveFileExistingTarget
-   PREPARE_COMMAND sh -c "touch -- --target && chmod -R oga-w -- --target MoveFileToDirectory/dir/--target"
-   ARGS move --force -- --target MoveFileToDirectory/dir/
-   MUST_NOT_EXIST --target
-   MUST_EXIST MoveFileToDirectory/dir/--target
+   NAME MoveDirectoryRecursive
+   DEPENDS MoveFileExistingTargetForce
+   PREPARE_COMMAND sh -c "mkdir -p MoveFileToDirectory/Target/dir && chmod -R oga-w MoveFileToDirectory"
+   ARGS --debug move --force --touch --time 2003-01-01 --target-directory MoveFileToDirectory/Target MoveFileToDirectory/dir
+   MUST_EXIST MoveFileToDirectory/Target/dir/--target
+   MUST_NOT_EXIST MoveFileToDirectory/dir
 )

src/OperationRemove.c

@@ -44,7 +44,7 @@ static tResult removeOperation(void) {
                hFind = FindFirstFile(DosDevicePath, &FindFileData);
                // GCOVR_EXCL_START
                if (hFind == INVALID_HANDLE_VALUE) {
-                  result = printLastError(_T("Got invalid handle for %s"), getReadableFilename(DosDevicePath));
+                  result &= printLastError(_T("Got invalid handle for %s"), getReadableFilename(DosDevicePath));
                }
                // GCOVR_EXCL_STOP
                else {
@@ -62,14 +62,16 @@ static tResult removeOperation(void) {
                   if (result == eOk) {
                      // GCOVR_EXCL_START
                      if (GetLastError() != ERROR_NO_MORE_FILES) {
-                        result = printLastError(_T("Can't get next file"));
+                        result &= printLastError(_T("Can't get next file"));
                      }
                      // GCOVR_EXCL_STOP
                   }
 
                   StartOfName[-1] = _T('\0');
                   // close handle to file
-                  FindClose(hFind);
+                  if (!FindClose(hFind)) {
+                     result &= printLastError(_T("Can't close file search handle."));
+                  }
                }
             }