feat: Using helper function for SCSI read capacity commands

There is a lot of reuse of the process for issuing read capacity and switching between 10B and 16B versions.
This change will use the new helper function from opensea-transport to reduce complexity and a single common method for getting device capacity information.

Signed-off-by: Tyler Erickson <[email protected]>

Author: vonericsen

src/openseachest_util_options.c

@@ -32,7 +32,7 @@ const char* deviceHandleExample = "/dev/sg<#>";
 const char* deviceHandleName    = "<sg_device>";
 const char* commandWindowType   = "terminal";
 #    endif
-#elif defined(__FreeBSD__) || defined (__DragonFly__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
 const char* deviceHandleExample = "/dev/da<#>";
 const char* deviceHandleName    = "<da_device>";
 const char* commandWindowType   = "shell";
@@ -120,7 +120,8 @@ void print_Elevated_Privileges_Text(void)
 #        endif
 #    elif defined(__DragonFly__)
     printf("In DragonFlyBSD, put sudo before the command. This may require inputting your login password.\n");
-    printf("In DragonFlyBSD, log in to a root terminal (su), then execute the command. This requires the root password.\n");
+    printf("In DragonFlyBSD, log in to a root terminal (su), then execute the command. This requires the root "
+           "password.\n");
 #    elif defined(__FreeBSD__)
     printf("In FreeBSD, put sudo before the command. This may require inputting your login password.\n");
     printf("In FreeBSD, log in to a root terminal (su), then execute the command. This requires the root password.\n");

subprojects/opensea-common

@@ -1306,6 +1306,16 @@ int main(int argc, char* argv[])
                             if (RAW_DATA_LEN_ADJUST_BY_BLOCKS_FLAG)
                             {
                                 // allocate based on logical block size
+                                if (deviceList[deviceIter].drive_info.deviceBlockSize == 0)
+                                {
+                                    //get the blocksize from read capacity first
+                                    readCapacityData readCapData;
+                                    safe_memset(&readCapData, sizeof(readCapacityData), 0, sizeof(readCapacityData));
+                                    if (SUCCESS == scsi_Read_Capacity_Cmd_Helper(&deviceList[deviceIter], &readCapData))
+                                    {
+                                        deviceList[deviceIter].drive_info.deviceBlockSize = readCapData.logicalBlockLength;
+                                    }
+                                }
                                 allocatedDataLength =
                                     deviceList[deviceIter].drive_info.deviceBlockSize * RAW_DATA_LEN_FLAG;
                             }
@@ -1342,11 +1352,31 @@ int main(int argc, char* argv[])
                                 int64_t fileOffset = RAW_INPUT_FILE_OFFSET_FLAG;
                                 if (RAW_INPUT_OFFSET_ADJUST_BY_BLOCKS_FLAG)
                                 {
+                                    if (deviceList[deviceIter].drive_info.deviceBlockSize == 0)
+                                    {
+                                        //get the blocksize from read capacity first
+                                        readCapacityData readCapData;
+                                        safe_memset(&readCapData, sizeof(readCapacityData), 0, sizeof(readCapacityData));
+                                        if (SUCCESS == scsi_Read_Capacity_Cmd_Helper(&deviceList[deviceIter], &readCapData))
+                                        {
+                                            deviceList[deviceIter].drive_info.deviceBlockSize = readCapData.logicalBlockLength;
+                                        }
+                                    }
                                     fileOffset =
                                         deviceList[deviceIter].drive_info.deviceBlockSize * RAW_INPUT_FILE_OFFSET_FLAG;
                                 }
                                 if (RAW_DATA_LEN_ADJUST_BY_BLOCKS_FLAG)
                                 {
+                                    if (deviceList[deviceIter].drive_info.deviceBlockSize == 0)
+                                    {
+                                        //get the blocksize from read capacity first
+                                        readCapacityData readCapData;
+                                        safe_memset(&readCapData, sizeof(readCapacityData), 0, sizeof(readCapacityData));
+                                        if (SUCCESS == scsi_Read_Capacity_Cmd_Helper(&deviceList[deviceIter], &readCapData))
+                                        {
+                                            deviceList[deviceIter].drive_info.deviceBlockSize = readCapData.logicalBlockLength;
+                                        }
+                                    }
                                     // allocate based on logical block size
                                     allocatedDataLength =
                                         deviceList[deviceIter].drive_info.deviceBlockSize * RAW_DATA_LEN_FLAG;