Skip to content

Commit

Permalink
Update messages and manpages
Browse files Browse the repository at this point in the history
  • Loading branch information
uweseimet committed Jan 8, 2025
1 parent 5e6b616 commit db98a35
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cpp/s2pdump/s2pdump_core.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ bool S2pDump::DisplayInquiry(bool check_type)
<< target_lun << "\n" << flush;
}
else {
cout << "Checking device corresponding to Linux SG 3 driver device file '" << device_file << "'\n" << flush;
cout << "Checking device corresponding to Linux SG driver device file '" << device_file << "'\n" << flush;
}

if (auto board_executor = dynamic_pointer_cast<BoardExecutor>(s2pdump_executor); board_executor) {
Expand Down
4 changes: 2 additions & 2 deletions cpp/s2pformat/s2pformat_core.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ int S2pFormat::Run(span<char*> args)
return EXIT_SUCCESS;
}

cout << "Are you sure? Formatting will erase all data and may take long (N/y)\n";
cout << "Are you sure? Formatting will erase all data and may take long. (N/y)\n";

string input;
getline(cin, input);
Expand Down Expand Up @@ -210,7 +210,7 @@ int S2pFormat::SelectFormat(span<const S2pFormat::FormatDescriptor> descriptors)

const auto &descriptor = descriptors[n - 1];

cout << "Format the drive with " << descriptor.blocks << " sectors, " << descriptor.length
cout << "Format with " << descriptor.blocks << " sectors, " << descriptor.length
<< " bytes per sector? (N/y)\n";

getline(cin, input);
Expand Down
2 changes: 1 addition & 1 deletion cpp/shared/sg_util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ int sg_util::OpenDevice(const string &device)
if (int v; ioctl(fd, SG_GET_VERSION_NUM, &v) < 0 || v < 30000) {
close (fd);
throw IoException(
fmt::format("'{0}' is not supported by the Linux SG 3 driver: {1}", device, strerror(errno)));
fmt::format("'{0}' is not supported by the Linux SG driver: {1}", device, strerror(errno)));
}

return fd;
Expand Down
2 changes: 1 addition & 1 deletion doc/s2pdump.1
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ s2pdump \- SCSI/SASI hard drive/tape drive dump/restore tool
.SH DESCRIPTION
.B s2pdump
has two modes of operation: dump and restore. These can be used with storage devices like hard drives, magneto optical drives or tape drives. Dump mode can also be used with read-only media such as CD/DVD drives.
When using devices managed by the Linux SG 3 driver, s2pdump can be used on any Linux system, not just on a Pi.
When using devices managed by the Linux SG driver, s2pdump can be used on any Linux system, not just on a Pi.

When operating in dump mode, s2pdump will copy all data from a remote drive to an image on the local filesystem. Optionally it generates a .properties file for the web UI. This file can be used to more closely emulate the source drive.
When used with a tape drive, the data are dumped in a SIMH-compatible format.
Expand Down

0 comments on commit db98a35

Please sign in to comment.