Worked on options and manpages

Author: joachimmetz

configure.ac

@@ -2,7 +2,7 @@ AC_PREREQ([2.71])
 
 AC_INIT(
   [libsmdev],
-  [20260623],
+  [20260624],
   [https://github.com/libyal/libsmdev/issues])
 
 AC_CONFIG_SRCDIR(

manuals/Makefile.am

@@ -3,8 +3,7 @@ man_MANS = \
 	smdevinfo.1
 
 EXTRA_DIST = \
-	libsmdev.3 \
-	smdevinfo.1
+	$(man_MANS)
 
 DISTCLEANFILES = \
 	Makefile \

manuals/libsmdev.3

@@ -1,4 +1,4 @@
-.Dd June 15, 2026
+.Dd June 24, 2026
 .Dt LIBSMDEV 3
 .Os
 .Sh NAME
@@ -451,7 +451,8 @@ To compile libsmdev with wide character support use:
  during compilation.
 .sp
 .Ar LIBSMDEV_WIDE_CHARACTER_TYPE
- in libsmdev/features.h can be used to determine if libsmdev was compiled with wide character support.
+ in libsmdev/features.h can be used to determine if libsmdev was compiled with \
+wide character support.
 .Sh SEE ALSO
 .In libsmdev.h
 .Sh AUTHORS

smdevtools/info_handle.c

@@ -594,17 +594,17 @@ int info_handle_tracks_fprint(
 	return( result );
 }
 
-/* Prints the handle information
+/* Prints the device information
  * Returns 1 if successful or -1 on error
  */
-int info_handle_handle_fprint(
+int info_handle_device_fprint(
      info_handle_t *info_handle,
      libcerror_error_t **error )
 {
 	uint8_t media_information_value[ 64 ];
         system_character_t byte_size_string[ 16 ];
 
-	static char *function     = "info_handle_handle_fprint";
+	static char *function     = "info_handle_device_fprint";
 	size64_t media_size       = 0;
 	uint32_t bytes_per_sector = 0;
 	uint8_t bus_type          = 0;

smdevtools/info_handle.h

@@ -81,7 +81,7 @@ int info_handle_tracks_fprint(
      info_handle_t *info_handle,
      libcerror_error_t **error );
 
-int info_handle_handle_fprint(
+int info_handle_device_fprint(
      info_handle_t *info_handle,
      libcerror_error_t **error );
 

smdevtools/smdevinfo.c

@@ -1,5 +1,5 @@
 /*
- * Shows information obtained from storage media (SM) devices
+ * Shows information obtained from a storage media (SM) device.
  *
  * Copyright (C) 2010-2026, Joachim Metz <joachim.metz@gmail.com>
  *
@@ -56,27 +56,6 @@
 info_handle_t *smdevinfo_info_handle = NULL;
 int smdevinfo_abort                  = 0;
 
-/* Prints the executable usage information
- */
-void usage_fprint(
-      FILE *stream )
-{
-	if( stream == NULL )
-	{
-		return;
-	}
-	fprintf( stream, "Use smdevinfo to determine information about storage\n"
-	                 "media (SM) device(s)\n\n" );
-
-	fprintf( stream, "Usage: smdevinfo [ -hivV ] source\n\n" );
-
-	fprintf( stream, "\tsource: the source device file\n\n" );
-
-	fprintf( stream, "\t-h:     shows this help\n" );
-	fprintf( stream, "\t-v:     verbose output to stderr\n" );
-	fprintf( stream, "\t-V:     print version\n" );
-}
-
 /* Signal handler for smdevinfo
  */
 void smdevinfo_signal_handler(
@@ -89,19 +68,21 @@ void smdevinfo_signal_handler(
 
 	smdevinfo_abort = 1;
 
-	if( ( smdevinfo_info_handle != NULL )
-	 && ( info_handle_signal_abort(
-	       smdevinfo_info_handle,
-	       &error ) != 1 ) )
+	if( smdevinfo_info_handle != NULL )
 	{
-		libcnotify_printf(
-		 "%s: unable to signal info handle to abort.\n",
-		 function );
-
-		libcnotify_print_error_backtrace(
-		 error );
-		libcerror_error_free(
-		 &error );
+		if( info_handle_signal_abort(
+		     smdevinfo_info_handle,
+		     &error ) != 1 )
+		{
+			libcnotify_printf(
+			 "%s: unable to signal info handle to abort.\n",
+			 function );
+
+			libcnotify_print_error_backtrace(
+			 error );
+			libcerror_error_free(
+			 &error );
+		}
 	}
 	/* Force stdin to close otherwise any function reading it will remain blocked
 	 */
@@ -127,10 +108,22 @@ int wmain( int argc, wchar_t * const argv[] )
 int main( int argc, char * const argv[] )
 #endif
 {
-	libcerror_error_t *error   = NULL;
+	const char *description = \
+		"Use smdevinfo to determine information about a storage media (SM) device.";
+
+	smdevtools_option_t options[ ] = {
+		{ 'h', NULL, "shows this help" },
+		{ 'v', NULL, "verbose output to stderr" },
+		{ 'V', NULL, "print version" },
+		{ 0, "source", "the source device" },
+	};
+	system_character_t options_string[ 32 ];
+
+	libsmdev_error_t *error    = NULL;
 	system_character_t *source = NULL;
 	char *program              = "smdevinfo";
 	system_integer_t option    = 0;
+	int number_of_options      = (int) ( sizeof( options ) / sizeof( smdevtools_option_t ) );
 	int verbose                = 0;
 
 #if defined( __MINGW32__ ) && defined( HAVE_MINGW_BINMODE )
@@ -145,7 +138,7 @@ int main( int argc, char * const argv[] )
 	 1 );
 
 	if( libclocale_initialize(
-             "smdevtools",
+	     "smdevtools",
 	     &error ) != 1 )
 	{
 		fprintf(
@@ -154,24 +147,36 @@ int main( int argc, char * const argv[] )
 
 		goto on_error;
 	}
-        if( smdevtools_output_initialize(
-             _IONBF,
-             &error ) != 1 )
+	if( smdevtools_output_initialize(
+	     _IONBF,
+	     &error ) != 1 )
 	{
 		fprintf(
 		 stderr,
 		 "Unable to initialize output settings.\n" );
 
 		goto on_error;
 	}
-	smdevoutput_version_fprint(
+	smdevtools_output_version_fprint(
 	 stdout,
 	 program );
 
+	if( smdevtools_getopt_get_options_string(
+	     options,
+	     number_of_options,
+	     options_string,
+	     32 ) != 1 )
+	{
+		fprintf(
+		 stderr,
+		 "Unable to determine options string.\n" );
+
+		goto on_error;
+	}
 	while( ( option = smdevtools_getopt(
 	                   argc,
 	                   argv,
-	                   _SYSTEM_STRING( "hvV" ) ) ) != (system_integer_t) -1 )
+	                   options_string ) ) != (system_integer_t) -1 )
 	{
 		switch( option )
 		{
@@ -182,14 +187,22 @@ int main( int argc, char * const argv[] )
 				 "Invalid argument: %" PRIs_SYSTEM "\n",
 				 argv[ optind - 1 ] );
 
-				usage_fprint(
-				 stdout );
+				smdevtools_getopt_usage_fprint(
+				 stdout,
+				 program,
+				 description,
+				 options,
+				 number_of_options );
 
 				return( EXIT_FAILURE );
 
 			case (system_integer_t) 'h':
-				usage_fprint(
-				 stdout );
+				smdevtools_getopt_usage_fprint(
+				 stdout,
+				 program,
+				 description,
+				 options,
+				 number_of_options );
 
 				return( EXIT_SUCCESS );
 
@@ -199,7 +212,7 @@ int main( int argc, char * const argv[] )
 				break;
 
 			case (system_integer_t) 'V':
-				smdevoutput_copyright_fprint(
+				smdevtools_output_copyright_fprint(
 				 stdout );
 
 				return( EXIT_SUCCESS );
@@ -209,10 +222,14 @@ int main( int argc, char * const argv[] )
 	{
 		fprintf(
 		 stderr,
-		 "Missing source file.\n" );
+		 "Missing source device.\n" );
 
-		usage_fprint(
-		 stdout );
+		smdevtools_getopt_usage_fprint(
+		 stdout,
+		 program,
+		 description,
+		 options,
+		 number_of_options );
 
 		return( EXIT_FAILURE );
 	}
@@ -230,13 +247,9 @@ int main( int argc, char * const argv[] )
 	     &smdevinfo_info_handle,
 	     &error ) != 1 )
 	{
-		smdevoutput_version_fprint(
-		 stderr,
-		 program );
-
 		fprintf(
 		 stderr,
-		 "Unable to create info handle.\n" );
+		 "Unable to initialize info handle.\n" );
 
 		goto on_error;
 	}
@@ -260,18 +273,17 @@ int main( int argc, char * const argv[] )
 	{
 		fprintf(
 		 stderr,
-		 "Unable to open file: %" PRIs_SYSTEM ".\n",
-		 source );
+		 "Unable to open source device.\n" );
 
 		goto on_error;
 	}
-	if( info_handle_handle_fprint(
+	if( info_handle_device_fprint(
 	     smdevinfo_info_handle,
 	     &error ) != 1 )
 	{
 		fprintf(
 		 stderr,
-		 "Unable to print information.\n" );
+		 "Unable to print device information.\n" );
 
 		goto on_error;
 	}
@@ -333,5 +345,5 @@ int main( int argc, char * const argv[] )
 		 NULL );
 	}
 	return( EXIT_FAILURE );
-
 }
+

smdevtools/smdevtools_output.c

@@ -92,7 +92,7 @@ int smdevtools_output_initialize(
 
 /* Prints the copyright information
  */
-void smdevoutput_copyright_fprint(
+void smdevtools_output_copyright_fprint(
       FILE *stream )
 {
 	if( stream == NULL )
@@ -117,7 +117,7 @@ void smdevoutput_copyright_fprint(
 
 /* Prints the version information
  */
-void smdevoutput_version_fprint(
+void smdevtools_output_version_fprint(
       FILE *stream,
       const char *program )
 {
@@ -138,7 +138,7 @@ void smdevoutput_version_fprint(
 
 /* Prints the detailed version information
  */
-void smdevoutput_version_detailed_fprint(
+void smdevtools_output_version_detailed_fprint(
       FILE *stream,
       const char *program )
 {

smdevtools/smdevtools_output.h

@@ -36,14 +36,14 @@ int smdevtools_output_initialize(
      int stdio_mode,
      libcerror_error_t **error );
 
-void smdevoutput_copyright_fprint(
+void smdevtools_output_copyright_fprint(
       FILE *stream );
 
-void smdevoutput_version_fprint(
+void smdevtools_output_version_fprint(
       FILE *stream,
       const char *program );
 
-void smdevoutput_version_detailed_fprint(
+void smdevtools_output_version_detailed_fprint(
       FILE *stream,
       const char *program );
 

tests/test_library.ps1

@@ -15,7 +15,7 @@ If (-Not (Test-Path ${TestExecutablesDirectory}))
 	Exit ${ExitFailure}
 }
 
-$Result = ${ExitIgnore}
+$Result = ${ExitSuccess}
 
 Foreach (${TestName} in ${LibraryTests} -split " ")
 {
@@ -24,11 +24,11 @@ Foreach (${TestName} in ${LibraryTests} -split " ")
 	{
 		Continue
 	}
-	$Result = RunTestBinary ${TestExecutablesDirectory} "smdev_test_${TestName}"
+	$ResultRun = RunTestBinary ${TestExecutablesDirectory} "smdev_test_${TestName}"
 
-	If ((${Result} -ne ${ExitSuccess}) -And (${Result} -ne ${ExitIgnore}))
+	If ((${ResultRun} -ne ${ExitSuccess}) -And (${ResultRun} -ne ${ExitIgnore}))
 	{
-		Break
+		$Result = ${ResultRun}
 	}
 }
 
@@ -43,17 +43,13 @@ Foreach (${TestName} in ${LibraryTestsWithInput} -split " ")
 	}
 	ForEach ($TestInput in ${TestInputs})
 	{
-		$Result = RunTestBinaryWithInput ${TestExecutablesDirectory} "smdev_test_${TestName}" ${TestInput}
+		$ResultRun = RunTestBinaryWithInput ${TestExecutablesDirectory} "smdev_test_${TestName}" ${TestInput}
 
-		If ((${Result} -ne ${ExitSuccess}) -And (${Result} -ne ${ExitIgnore}))
+		If ((${ResultRun} -ne ${ExitSuccess}) -And (${ResultRun} -ne ${ExitIgnore}))
 		{
-			Break
+			$Result = ${ResultRun}
 		}
 	}
-	If ((${Result} -ne ${ExitSuccess}) -And (${Result} -ne ${ExitIgnore}))
-	{
-		Break
-	}
 }
 
 Exit ${Result}