commit fc2cf42e243e30cf143ab5529e94f52cf00b10ee Author: zyppe <210hcl@gmail.com> Date: Wed Feb 7 23:05:43 2024 +0800 Initialize for fillup diff --git a/.fillup.metadata b/.fillup.metadata new file mode 100644 index 0000000..663723e --- /dev/null +++ b/.fillup.metadata @@ -0,0 +1 @@ +d8bbf3b1244f5222cde811bc9248a12beabd5a41a485d3ea21126fb0d9b6a613 fillup-1.42.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..725802a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +fillup-1.42.tar.bz2 diff --git a/fillup-1.42-cloexec.patch b/fillup-1.42-cloexec.patch new file mode 100644 index 0000000..22f6d79 --- /dev/null +++ b/fillup-1.42-cloexec.patch @@ -0,0 +1,20 @@ +--- SRC/services.c.orig ++++ SRC/services.c +@@ -342,7 +342,7 @@ openFileForReading + { + Service_t returnValue; + +- *filePointer = fopen( filename, "r" ); ++ *filePointer = fopen( filename, "re" ); + if( *filePointer == NULL ) + { + fillup_exception( __FILE__, __LINE__, ServiceException, +@@ -368,7 +368,7 @@ openFileForWriting + { + Service_t returnValue; + +- *filePointer = fopen( filename, "w" ); ++ *filePointer = fopen( filename, "we" ); + if( *filePointer == NULL ) + { + fillup_exception( __FILE__, __LINE__, ServiceException, diff --git a/fillup-1.42.dif b/fillup-1.42.dif new file mode 100644 index 0000000..353f76d --- /dev/null +++ b/fillup-1.42.dif @@ -0,0 +1,226 @@ +--- SRC/consume.c.orig ++++ SRC/consume.c +@@ -140,7 +140,7 @@ consumeUptoBreak + { + break; /* line break detected */ + } +- else if( *buffer == EOF ) ++ else if( *buffer == 0 ) + { + break; /* End-Of-File detected */ + } +--- SRC/file.c.orig ++++ SRC/file.c +@@ -35,18 +35,34 @@ readFile + File_t returnValue; + FILE * filePointer; + long fileLength; +- char * buffer = NULL; + + if( FileOpened == openFileForReading( filename, &filePointer ) ) + { + if( Success == getFileLength( filePointer, &fileLength ) ) + { +- if( Success == +- allocateBuffer( fileLength, ( void ** )&buffer ) ) ++ void * ptr; ++ ++ /* ++ * Allocate one byte more if a newline must be added ++ */ ++ if( Success == allocateBuffer( fileLength + 1 , &ptr ) ) + { +- if( Success == +- readFileToBuffer( filePointer, fileLength, &buffer ) ) +- { ++ char * buffer = ( char * )ptr; ++ ++ if( Success == readFileToBuffer( filePointer, fileLength, &buffer ) ) ++ { ++ ++ if ( FALSE == queryParameter( IgnoreEOF ) ) ++ { ++ char * eof = (buffer + fileLength - 1); ++ ++ if ( *eof != '\n' ) ++ { ++ *( eof + 1 ) = '\n'; ++ fileLength++; ++ } ++ } ++ + addToWatchdog( fileLength ); + associateBuffer( fileSpecifier, fileLength, &buffer ); + returnValue = FileOperationsSuccessful; +--- SRC/parameters.c.orig ++++ SRC/parameters.c +@@ -368,6 +368,13 @@ queryParameter + } + break; + ++ case IgnoreEOF: ++ if( parameterIgnoreEOF == IsSet ) ++ { ++ returnValue = TRUE; ++ } ++ break; ++ + case IgnoreDefinites: + if( parameterIgnoreDefinites == IsSet ) + { +--- SRC/parser.c.orig ++++ SRC/parser.c +@@ -19,7 +19,7 @@ + /*--------------------------------- IMPORTS ----------------------------------*/ + + #include +- ++#include + #include "portab.h" + #include "variableblock.h" + #include "parameters.h" +@@ -296,6 +296,7 @@ createAdministrationInfo + unsigned long Size; + char * delimiterString; + char delimiterChar; ++ void * ptr; + + queryStringParameter( Delimiter, &delimiterString ); + delimiterChar = delimiterString[ 0 ]; +@@ -305,23 +306,25 @@ createAdministrationInfo + countDelimiters( delimiterChar, baseFileBuffer, baseFileBufferLength ); + baseFileBlocksLength++; /* add possible trailing comment */ + Size = baseFileBlocksLength * sizeof( VariableBlock_t ); +- if( Success != allocateBuffer( Size, ( void ** )&baseFileBlock ) ) ++ if( Success != allocateBuffer( Size, &ptr ) ) + { + fillup_exception( __FILE__, __LINE__, ConfigurationException, + "createAdministrationInfo" ); + exitOnFailure( ); + } ++ baseFileBlock = ( VariableBlock_t * )ptr; + + additionalFileBlocksLength = countDelimiters( + delimiterChar, additionalFileBuffer, additionalFileBufferLength ); + additionalFileBlocksLength++; /* add possible trailing comment */ + Size = additionalFileBlocksLength * sizeof( VariableBlock_t ); +- if( Success != allocateBuffer( Size, ( void ** )&additionalFileBlock ) ) ++ if( Success != allocateBuffer( Size, &ptr ) ) + { + fillup_exception( __FILE__, __LINE__, ConfigurationException, + "createAdministrationInfo" ); + exitOnFailure( ); + } ++ additionalFileBlock = ( VariableBlock_t * )ptr; + + if( queryParameter( ForbiddenFile ) == TRUE ) + { +@@ -329,12 +332,13 @@ createAdministrationInfo + delimiterChar, forbiddenFileBuffer, forbiddenFileBufferLength ); + forbiddenFileBlocksLength++; /* add possible trailing comment */ + Size = forbiddenFileBlocksLength * sizeof( VariableBlock_t ); +- if( Success != allocateBuffer( Size, ( void ** )&forbiddenFileBlock ) ) ++ if( Success != allocateBuffer( Size, &ptr ) ) + { + fillup_exception( __FILE__, __LINE__, ConfigurationException, + "createAdministrationInfo" ); + exitOnFailure( ); + } ++ forbiddenFileBlock = ( VariableBlock_t * )ptr; + } + } + +@@ -477,8 +481,8 @@ getVariable + getVBeginOfBlock( outputBuffer, &Line ); + Line = Line + getVLength( outputBuffer ); + LinePointer = Line; +- for( lineIndex = 0; +- ( *LinePointer != EOF ) && ( *LinePointer != '\n' ); ++ for( lineIndex = 0; ++ ( *LinePointer != 0 ) && ( *LinePointer != '\n' ) ; + lineIndex++ ) + { + LinePointer++; /* concerns only the current line */ +@@ -1768,6 +1772,8 @@ writeOutput + } + listPointer++; + } ++ if(fflush( filePointer ) != 0) fillup_exception( __FILE__, __LINE__, ServiceException, "cannot flush stream"); ++ if(fdatasync ( fileno(filePointer) ) != 0) fillup_exception( __FILE__, __LINE__, ServiceException, "cannot sync stream"); + closeFile( filePointer ); + } + } +@@ -1830,7 +1836,9 @@ writeOutput + default: break; + } + listPointer++; +- } ++ } ++ if(fflush( filePointer ) != 0) fillup_exception( __FILE__, __LINE__, ServiceException, "cannot flush stream"); ++ if(fdatasync ( fileno(filePointer) ) != 0) fillup_exception( __FILE__, __LINE__, ServiceException, "cannot sync stream"); + closeFile( filePointer ); + } + } +--- SRC/services.c.orig ++++ SRC/services.c +@@ -444,8 +444,9 @@ readFileToBuffer + + if( 0 == fseek( filePointer, 0L, SEEK_SET ) ) + { +- if( fileLength == +- ( long )fread( *fileBuffer, sizeof( char ), fileLength, filePointer ) ) ++ if( ( fileLength == ++ ( long )fread( *fileBuffer, sizeof( char ), fileLength, filePointer ) ) ++ && ( 0 == ferror( filePointer ) ) ) + { + returnValue = Success; + } +@@ -558,23 +559,22 @@ dumpBlock + Service_t + allocateBuffer + ( +- long fileLength, /* in */ ++ long Length, /* in */ + void ** buffer /* out */ + ) + { + Service_t returnValue; + +- *buffer = malloc( fileLength + 1 ); ++ *buffer = malloc( Length + 1 ); + if( *buffer == NULL ) + { +- fillup_exception( __FILE__, __LINE__, ServiceException, +- "malloc" ); ++ fillup_exception( __FILE__, __LINE__, ServiceException, "malloc" ); + returnValue = Error; + } + else + { + /* reset the buffer */ +- ( void )memset( *buffer, EOF, fileLength + 1 ); ++ ( void )memset( *buffer, 0, Length + 1 ); + + returnValue = Success; + } +--- SRC/metadata.c.orig ++++ SRC/metadata.c +@@ -17,7 +17,7 @@ + /*--------------------------------- IMPORTS ----------------------------------*/ + + #include +- ++#include + #include "variableblock.h" + #include "services.h" + #include "parser.h" +@@ -392,7 +392,8 @@ setMetadataInfo + logfile ); + fprintf( logfile, ">\n\n" ); + } +- ++ if(fflush( logfile ) != 0) fillup_exception( __FILE__, __LINE__, ServiceException, "cannot flush stream"); ++ if(fdatasync( fileno(logfile) ) != 0) fillup_exception( __FILE__, __LINE__, ServiceException, "cannot sync stream"); + closeFile( logfile ); + } + } diff --git a/fillup-nodate.patch b/fillup-nodate.patch new file mode 100644 index 0000000..deb3cb0 --- /dev/null +++ b/fillup-nodate.patch @@ -0,0 +1,23 @@ +Index: SRC/services.c +=================================================================== +--- SRC/services.c.orig ++++ SRC/services.c +@@ -263,11 +263,15 @@ displayVersion + ) + { + static const char *versionString = +- "This is fillup, version %1.2f, compiled on %s\n\n"; ++ "This is fillup, version %1.2f\n\n"; + +- if( ( int )( strlen( versionString ) + strlen( __DATE__ ) - 3 ) != +- fprintf( stderr, versionString, VERSION, __DATE__ ) ) ++ if( ( int )( strlen( versionString ) - 1 ) != ++ fprintf( stderr, versionString, VERSION ) ) + { ++int res= fprintf( stderr, versionString, VERSION ); ++ ++fprintf (stderr,"strlen: %d, res: %d\n", strlen( versionString ), res); ++ + fillup_exception( __FILE__, __LINE__, ServiceException, + "displayVersion" ); + exitOnFailure( ); diff --git a/fillup-optflags.patch b/fillup-optflags.patch new file mode 100644 index 0000000..5fea08f --- /dev/null +++ b/fillup-optflags.patch @@ -0,0 +1,41 @@ +--- SRC/Makefile.orig ++++ SRC/Makefile +@@ -37,7 +37,7 @@ ARCHIVE = ${PROJDIR}/ARCHIVE + WARNINGS = -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes + # WARNINGS = -Wunused -Wswitch -Wformat -Wreturn-type -Wimplicit -Wmissing-prototypes -Wmissing-declarations + +-DEFINES = ++DEFINES = -D_GNU_SOURCE + + # LINUX system + OPTISPLUS = +@@ -46,24 +46,23 @@ INC = -I/usr/include + COMPILER = -DGCC=1 + + # Set OPTIS to the following values +-OPTIS = $(OPTISPLUS) -O2 -fforce-addr -finline-functions -fno-function-cse \ +- -fkeep-inline-functions ++OPTIS = $(OPTISPLUS) -O2 + + ifeq ($(COMPILE_OPTION),DEBUG) + # compile for debugging +- COMPILE = gcc -fsigned-char -DDEBUG -ansi -g -c ${WARNINGS} -I${SRC} -I${INC} ${COMPILER} ${SYS} ${DEFINES} ++ COMPILE = gcc -DDEBUG -std=gnu99 -g -c $(OPTIS) ${WARNINGS} -I${SRC} -I${INC} ${COMPILER} ${SYS} ${DEFINES} + LINK = gcc -g + endif + + ifeq ($(COMPILE_OPTION),OPTIMIZE) + # compile with all optimizations +- COMPILE = gcc -fsigned-char -ansi -c $(OPTIS) $(WARNINGS) -I${SRC} -I${INC} ${COMPILER} ${SYS} ${DEFINES} +- LINK = gcc -O -s ++ COMPILE = gcc -std=gnu99 -c $(OPTIS) $(WARNINGS) -I${SRC} -I${INC} ${COMPILER} ${SYS} ${DEFINES} ++ LINK = gcc + endif + + ifeq ($(COMPILE_OPTION),PROFILE) + # compile for use with "gprof" +- COMPILE = gcc -fsigned-char -ansi -pg -c ${WARNINGS} -I${SRC} -I${INC} ${COMPILER} ${SYS} ${DEFINES} ++ COMPILE = gcc -ansi -pg -c ${WARNINGS} -I${SRC} -I${INC} ${COMPILER} ${SYS} ${DEFINES} + LINK = gcc -pg + endif + diff --git a/fillup-retval.dif b/fillup-retval.dif new file mode 100644 index 0000000..adc63a0 --- /dev/null +++ b/fillup-retval.dif @@ -0,0 +1,11 @@ +--- TEST/FCSR/SRC/CreateRemoved.c ++++ TEST/FCSR/SRC/CreateRemoved.c +@@ -48,7 +48,7 @@ + printf( "\n" ); + index = 0; + +- if( argument & 0x2L ) return; /* single variable but removed */ ++ if( argument & 0x2L ) return 0; /* single variable but removed */ + + argument = argument >> 2; + while( ( index < numberOfKeywords ) && ( argument > 0 ) ) diff --git a/fillup-warnings.dif b/fillup-warnings.dif new file mode 100644 index 0000000..1024c31 --- /dev/null +++ b/fillup-warnings.dif @@ -0,0 +1,97 @@ +diff -ruN fillup-1.42/SRC/metadata.c fillup-1.42-new/SRC/metadata.c +--- fillup-1.42/SRC/metadata.c 2003-09-10 14:20:00.000000000 +0200 ++++ fillup-1.42-new/SRC/metadata.c 2005-07-06 10:50:55.000000000 +0200 +@@ -165,6 +165,10 @@ + MetadataKeyword_t loop; + long offset; + ++ /* Both return values are explicitely initialized */ ++ Result = Metadata_Number; ++ *length = 0; ++ + offset = 0; + offset += consumeBlanksOrTabs( &precedingComment[ offset ], variableLength - offset ); + for( loop=0; loop to +* Mon Aug 12 2002 ro@suse.de +- split off aaa_base diff --git a/fillup.spec b/fillup.spec new file mode 100644 index 0000000..07acaa2 --- /dev/null +++ b/fillup.spec @@ -0,0 +1,71 @@ +# +# spec file for package fillup +# +# Copyright (c) 2022-2023 ZhuningOS +# + + +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + +Name: fillup +Version: 1.42 +Release: 2.18 +Summary: Tool for Merging Config Files +License: GPL-2.0+ +Group: System/Base +Url: http://github.com/openSUSE/fillup +Source: fillup-%{version}.tar.bz2 +Patch0: fillup-optflags.patch +Patch1: fillup-warnings.dif +Patch2: fillup-%{version}.dif +Patch3: fillup-retval.dif +Patch4: fillup-nodate.patch +Patch5: fillup-1.42-cloexec.patch +Provides: aaa_base:/bin/fillup +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +fillup merges files that hold variables. A variable is defined by an +entity composed of a preceding comment, a variable name, an assignment +delimiter, and a related variable value. A variable is determined by +its variable name. + +%prep +%setup -q +%patch0 +%patch1 -p1 +%patch2 +%patch3 +%patch4 +%patch5 + +%build +make %{?_smp_mflags} compile COMPILE_OPTION=OPTIMIZE OPTISPLUS="%{optflags}" + +%install +mkdir -p %{buildroot}%{_fillupdir} +install -d -m 755 %{buildroot}/%{_bindir} +install -m 755 BIN/fillup %{buildroot}/%{_bindir} +install -d %{buildroot}/%{_mandir}/man8 +install -m 644 SGML/fillup.8.gz %{buildroot}/%{_mandir}/man8 + +#UsrMerge - There are literally hundreds of rpm scritps referencing /bin/fillup (suse macro) +# So let's at least keep the symlink there for now (DimStar - 2014-10-31) +install -d -m 755 $RPM_BUILD_ROOT/bin +ln -sf %{_bindir}/fillup $RPM_BUILD_ROOT/bin +#EndUserMerge + +%check +make %{?_smp_mflags} test OPTISPLUS="%{optflags}" + +%files +%defattr(-,root,root) +# rpm scriptlets still use this, based on %*fillup* macros +/bin/fillup +%{_bindir}/fillup +%{_mandir}/man8/fillup* + +%changelog