Specify mode while creating file instead of later chmod in xsrc

Author: kala13x

build.sh

@@ -55,7 +55,7 @@ find_lib() {
 }
 
 clean_dir() {
-    cd "$@" 
+    cd "$@"
     [ -f ./Makefile ] && make clean
     [ -d ./obj ] && rm -rf ./obj
     [ -d ./build ] && rm -rf ./build

src/data/buf.c

@@ -256,6 +256,12 @@ int XByteBuffer_AddByte(xbyte_buffer_t *pBuffer, uint8_t nByte)
     return (int)pBuffer->nUsed;
 }
 
+uint8_t XByteBuffer_GetByte(xbyte_buffer_t *pBuffer, size_t nIndex)
+{
+    if (nIndex >= pBuffer->nUsed) return 0;
+    return pBuffer->pData[nIndex];
+}
+
 int XByteBuffer_NullTerm(xbyte_buffer_t *pBuffer)
 {
     if (XByteBuffer_Reserve(pBuffer, 1) <= 0) return XSTDERR;

src/data/buf.h

@@ -32,6 +32,7 @@ typedef struct XByteBuffer {
 uint8_t *XByteData_Dup(const uint8_t *pBuff, size_t nSize);
 xbool_t XByteBuffer_HasData(xbyte_buffer_t *pBuffer);
 xbyte_buffer_t* XByteBuffer_New(size_t nSize, int nFastAlloc);
+uint8_t XByteBuffer_GetByte(xbyte_buffer_t *pBuffer, size_t nIndex);
 void XByteBuffer_Free(xbyte_buffer_t **pBuffer);
 void XByteBuffer_Clear(xbyte_buffer_t *pBuffer);
 void XByteBuffer_Reset(xbyte_buffer_t *pBuffer);

src/sys/xfs.c

@@ -75,6 +75,8 @@ int xstat(const char *pPath, xstat_t *pStat)
 
 int XFile_ParseFlags(const char *pFlags)
 {
+    if (pFlags == NULL) return 0;
+
     size_t i, nLen = strnlen(pFlags, XFILE_FLAGS_LEN);
     int nFlags = 0;
 
@@ -129,10 +131,30 @@ int XFile_ParseFlags(const char *pFlags)
     return nFlags;
 }
 
+int XFile_OpenM(xfile_t *pFile, const char *pPath, const char *pFlags, xmode_t nMode)
+{
+    if (pFile == NULL || pPath == NULL) return XSTDERR;
+    pFile->nFlags = XFile_ParseFlags(pFlags);
+    pFile->nBlockSize = XFILE_BUF_SIZE;
+    pFile->nMode = nMode;
+    pFile->bEOF = XFALSE;
+    pFile->nSize = 0;
+    pFile->nFD = -1;
+
+#ifdef _WIN32
+    _sopen_s(&pFile->nFD, pPath, pFile->nFlags, _SH_DENYNO, pFile->nMode);
+#else
+    pFile->nFD = open(pPath, pFile->nFlags, pFile->nMode);
+#endif
+
+    pFile->nPosit = pFile->nAlloc = 0;
+    return pFile->nFD;
+}
+
 int XFile_Open(xfile_t *pFile, const char *pPath, const char *pFlags, const char *pPerms)
 {
     if (pFile == NULL || pPath == NULL) return XSTDERR;
-    pFile->nFlags = (pFlags != NULL) ? XFile_ParseFlags(pFlags) : 0;
+    pFile->nFlags = XFile_ParseFlags(pFlags);
     pFile->nBlockSize = XFILE_BUF_SIZE;
     pFile->bEOF = XFALSE;
     pFile->nSize = 0;

src/sys/xfs.h

@@ -85,6 +85,7 @@ int xunlink(const char* pPath);
 int xrmdir(const char* pPath);
 int xclose(int nFD);
 
+int XFile_OpenM(xfile_t *pFile, const char *pPath, const char *pFlags, xmode_t nMode);
 int XFile_Open(xfile_t *pFile, const char *pPath, const char *pFlags, const char *pPerms);
 int XFile_Reopen(xfile_t *pFile, const char *pPath, const char *pFlags, const char *pPerms);
 xfile_t* XFile_Alloc(const char *pPath, const char *pFlags, const char *pPerms);

src/xver.h

@@ -12,7 +12,7 @@
 
 #define XUTILS_VERSION_MAX      2
 #define XUTILS_VERSION_MIN      7
-#define XUTILS_BUILD_NUMBER     20
+#define XUTILS_BUILD_NUMBER     21
 #define XUTILS_RELEASE_DATE     "30Jan2025"
 
 #ifdef __cplusplus

tools/xsrc.c

@@ -527,7 +527,9 @@ int XSearch_StripEmptySpaces(xsearch_args_t *pArgs, xsearch_entry_t *pEntry)
 
     xfile_t file;
     xbool_t bDirty = XFALSE;
+
     char sLine[XLINE_MAX];
+    size_t nLinesProcessed = 0;
 
     xbyte_buffer_t buffer;
     XByteBuffer_Init(&buffer, XLINE_MAX, XSTDNON);
@@ -541,7 +543,7 @@ int XSearch_StripEmptySpaces(xsearch_args_t *pArgs, xsearch_entry_t *pEntry)
     {
         xbool_t bDropLine = XFALSE;
         xbool_t bModified = XFALSE;
-        int nFirstSpace = XSTDERR;
+        int nFirstSpace = -1;
         int nPosit = 0;
 
         while (nPosit < nLength)
@@ -559,7 +561,8 @@ int XSearch_StripEmptySpaces(xsearch_args_t *pArgs, xsearch_entry_t *pEntry)
         if (nFirstSpace >= 0 && nFirstSpace < nLength)
         {
             nNextLength = XFile_GetLine(&file, sNextLine, sizeof(sNextLine));
-            bDropLine = !nFirstSpace && nNextLength <= 0 ? XTRUE : XFALSE;
+            bDropLine = !nFirstSpace && nNextLength <= 0 && nLinesProcessed &&
+                        sLine[nLength - 1] != '\n' ? XTRUE : XFALSE;
 
             if (nFirstSpace == 0 ||
                 nNextLength <= 0 ||
@@ -579,31 +582,33 @@ int XSearch_StripEmptySpaces(xsearch_args_t *pArgs, xsearch_entry_t *pEntry)
                 XByteBuffer_Clear, &buffer, XFile_Close, &file, XSTDERR);
         }
 
-        if (pArgs->bFinalNewline && nNextLength <= 0 &&
-            nLength > 0 && sLine[nLength - 1] != '\n')
-        {
-            XASSERT_CALL2((XByteBuffer_Add(&buffer, (const uint8_t*)"\n", 1) > 0),
-                XByteBuffer_Clear, &buffer, XFile_Close, &file, XSTDERR);
-
-            bDirty = XTRUE;
-        }
-
         if (bModified)
         {
-            xstrncpy(sLine, sizeof(sLine), sNextLine);
+            if (nNextLength > 0)
+                xstrncpy(sLine, sizeof(sLine), sNextLine);
+
             nLength = nNextLength;
+            nLinesProcessed++;
             continue;
         }
 
         nLength = XFile_GetLine(&file, sLine, sizeof(sLine));
+        nLinesProcessed++;
     }
 
     // Finished reading
     XFile_Close(&file);
 
-    if (!bDirty)
+    if (pArgs->bFinalNewline && (!buffer.nUsed || buffer.pData[buffer.nUsed - 1] != '\n'))
+    {
+        XASSERT_CALL((XByteBuffer_Add(&buffer, (const uint8_t*)"\n", 1) > 0),
+            XByteBuffer_Clear, &buffer, XSTDERR);
+
+        bDirty = XTRUE;
+    }
+
+    if (!bDirty || !buffer.nUsed)
     {
-        // No need to change anything
         XByteBuffer_Clear(&buffer);
         return XSTDNON;
     }
@@ -616,7 +621,7 @@ int XSearch_StripEmptySpaces(xsearch_args_t *pArgs, xsearch_entry_t *pEntry)
 
     if (XPath_Exists(sEntryBackup))
     {
-        if (XFile_Open(&file, sEntry, "cwt", NULL) < 0)
+        if (XFile_OpenM(&file, sEntry, "cwt", pEntry->nMode) < 0)
         {
             xloge("Failed to open file: %s (%s)", sEntry, XSTRERR);
             rename(sEntryBackup, sEntry);
@@ -636,7 +641,6 @@ int XSearch_StripEmptySpaces(xsearch_args_t *pArgs, xsearch_entry_t *pEntry)
 
         XFile_Close(&file);
         unlink(sEntryBackup);
-        chmod(sEntry, pEntry->nMode);
     }
 
     XByteBuffer_Clear(&buffer);