diff options
author | Norbert Preining <norbert@preining.info> | 2020-09-20 03:03:26 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-09-20 03:03:26 +0000 |
commit | 1f457376b478257b88d4a857f5ec1b6155442dd7 (patch) | |
tree | 2a06a60551dea362cf8cb0cb0ba66c78608717c4 /support/dktools/dk4ufi08.ctr | |
parent | ac690ca29ad5bf8a5203a65fd6252f7b564f4727 (diff) |
CTAN sync 202009200303
Diffstat (limited to 'support/dktools/dk4ufi08.ctr')
-rw-r--r-- | support/dktools/dk4ufi08.ctr | 57 |
1 files changed, 52 insertions, 5 deletions
diff --git a/support/dktools/dk4ufi08.ctr b/support/dktools/dk4ufi08.ctr index 5bfdd4d4dc..8899b98902 100644 --- a/support/dktools/dk4ufi08.ctr +++ b/support/dktools/dk4ufi08.ctr @@ -2,7 +2,7 @@ copyright owner = Dirk Krause copyright year = 2015-xxxx -license = bsd +SPDX-License-Identifier: BSD-3-Clause %% header @@ -15,12 +15,28 @@ license = bsd CRT on Windows: Not used. */ +#ifndef DK4CONF_H_INCLUDED +#if DK4_BUILDING_DKTOOLS4 +#include "dk4conf.h" +#else +#include <dktools-4/dk4conf.h> +#endif +#endif + #ifndef DK4UFI_H_INCLUDED +#if DK4_BUILDING_DKTOOLS4 #include "dk4ufit.h" +#else +#include <dktools-4/dk4ufit.h> +#endif #endif #ifndef DK4ERROR_H_INCLUDED +#if DK4_BUILDING_DKTOOLS4 #include "dk4error.h" +#else +#include <dktools-4/dk4error.h> +#endif #endif #ifdef __cplusplus @@ -104,6 +120,17 @@ dk4ufi_get_l_c8(dk4_ufi_t *dptr, const char *fn, dk4_er_t *erp); #include "dk4ufi08.h" +#if DK4_HAVE_ASSERT_H +#ifndef ASSERT_H_INCLUDED +#include <assert.h> +#define ASSERT_H_INCLUDED 1 +#endif +#endif + + +$!trace-include + + int dk4ufi_get_c8(dk4_ufi_t *dptr, const char *fn, dk4_er_t *erp) @@ -115,6 +142,10 @@ dk4ufi_get_c8(dk4_ufi_t *dptr, const char *fn, dk4_er_t *erp) DWORD dwattr; int i; int back = 0; +#if DK4_USE_ASSERT + assert(NULL != dptr); + assert(NULL != fn); +#endif if ((NULL != dptr) && (NULL != fn)) { dwattr = GetFileAttributesA(fn); if (INVALID_FILE_ATTRIBUTES == dwattr) { @@ -173,15 +204,21 @@ dk4ufi_get_c8(dk4_ufi_t *dptr, const char *fn, dk4_er_t *erp) #else dk4_stat_t stb; int back = 0; + $? "+ dk4ufi_get_c8 \"%!8s\"", TR_8STR(fn) +#if DK4_USE_ASSERT + assert(NULL != dptr); + assert(NULL != fn); +#endif if ((NULL != dptr) && (NULL != fn)) { if (0 != dk4stat_c8(&stb, fn, erp)) { - dptr->dev = stb.st_dev; - dptr->ino = stb.st_ino; + dptr->dev = stb.st_dev; $? ". dev = %lu", (unsigned long)(stb.st_dev) + dptr->ino = stb.st_ino; $? ". ino = %lu", (unsigned long)(stb.st_ino) back = 1; } } else { dk4error_set_simple_error_code(erp, DK4_E_INVALID_ARGUMENTS); } + $? "- dk4ufi_get_c8 %d", back return back; #endif } @@ -198,6 +235,10 @@ dk4ufi_get_l_c8(dk4_ufi_t *dptr, const char *fn, dk4_er_t *erp) DWORD dwattr; int i; int back = 0; +#if DK4_USE_ASSERT + assert(NULL != dptr); + assert(NULL != fn); +#endif if ((NULL != dptr) && (NULL != fn)) { dwattr = GetFileAttributesA(fn); if (INVALID_FILE_ATTRIBUTES == dwattr) { @@ -256,15 +297,21 @@ dk4ufi_get_l_c8(dk4_ufi_t *dptr, const char *fn, dk4_er_t *erp) #else dk4_stat_t stb; int back = 0; + $? "+ dk4ufi_get_l_c8 \"%!8s\"", TR_8STR(fn) +#if DK4_USE_ASSERT + assert(NULL != dptr); + assert(NULL != fn); +#endif if ((NULL != dptr) && (NULL != fn)) { if (0 != dk4stat_l_c8(&stb, fn, erp)) { - dptr->dev = stb.st_dev; - dptr->ino = stb.st_ino; + dptr->dev = stb.st_dev; $? ". dev = %lu", (unsigned long)(stb.st_dev) + dptr->ino = stb.st_ino; $? ". dev = %lu", (unsigned long)(stb.st_ino) back = 1; } } else { dk4error_set_simple_error_code(erp, DK4_E_INVALID_ARGUMENTS); } + $? "- dk4ufi_get_l_c8 %d", back return back; #endif } |