mirror of
https://git.freebsd.org/ports.git
synced 2025-06-09 23:00:30 -04:00
46 lines
1.4 KiB
C
46 lines
1.4 KiB
C
--- lib/tpm_utils.c.orig 2017-02-21 01:23:56 UTC
|
|
+++ lib/tpm_utils.c
|
|
@@ -55,6 +55,7 @@ genericOptHandler( int a_iNumArgs, char **a_pszArgs,
|
|
CmdHelpFunction tCmdHelp = ( a_tCmdHelpFunction ) ? a_tCmdHelpFunction
|
|
: logCmdHelp;
|
|
|
|
+#ifdef __GCC
|
|
char szShortOpts[strlen( pszGenShortOpts )
|
|
+ ( ( a_pszShortOpts == NULL ) ? 0 : strlen( a_pszShortOpts ) )
|
|
+ 1];
|
|
@@ -64,12 +65,35 @@ genericOptHandler( int a_iNumArgs, char **a_pszArgs,
|
|
|
|
int iOpt;
|
|
int rc;
|
|
+#else
|
|
+ int iOpt;
|
|
+ int rc;
|
|
|
|
+ char *szShortOpts;
|
|
+ int iNumShortOpts, iNumGenLongOpts;
|
|
+ struct option *sLongOpts;
|
|
+
|
|
+ iNumShortOpts = strlen( pszGenShortOpts ) +
|
|
+ ( ( a_pszShortOpts == NULL ) ? 0 : strlen( a_pszShortOpts ) );
|
|
+ iNumGenLongOpts = sizeof( sGenLongOpts ) / sizeof( struct option );
|
|
+
|
|
+ szShortOpts = malloc(iNumShortOpts + 1);
|
|
+ sLongOpts = malloc((iNumGenLongOpts + a_iNumOpts + 1)
|
|
+ * sizeof(struct option));
|
|
+ if( (szShortOpts == NULL) || (sLongOpts == NULL) ) {
|
|
+ perror("malloc");
|
|
+ return -1;
|
|
+ }
|
|
+#endif
|
|
strcpy( szShortOpts, pszGenShortOpts);
|
|
if ( a_pszShortOpts )
|
|
strcat( szShortOpts, a_pszShortOpts );
|
|
|
|
+#ifdef __GCC
|
|
__memset( sLongOpts, 0, sizeof( sLongOpts ) );
|
|
+#else
|
|
+ __memset( sLongOpts, 0, (iNumGenLongOpts + a_iNumOpts + 1) * sizeof(struct option));
|
|
+#endif
|
|
memcpy( sLongOpts, sGenLongOpts, sizeof( sGenLongOpts ) );
|
|
if ( a_sLongOpts ) {
|
|
memcpy( sLongOpts + iNumGenLongOpts,
|