Ignore:
Timestamp:
Mar 13, 2025, 9:26:17 AM (6 months ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
master
Children:
8b639f9
Parents:
3bd9508 (diff), 594671a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

fix pull conflicit

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tests/meta/dumpable.cfa

    r3bd9508 r3e91c6f9  
    1010// Created On       : Wed Jan 05 13:53:22 2022
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Fri Jul 19 07:58:45 2024
    13 // Update Count     : 10
     12// Last Modified On : Sun Mar  2 20:56:32 2025
     13// Update Count     : 18
    1414//
    1515
     
    4444void check_permission() {
    4545        char myExe[PATH_MAX];
    46         ssize_t n = readlink( "/proc/self/exe", myExe, sizeof(myExe));
     46
     47        #define exe "/proc/self/exe"
     48        ssize_t n = readlink( exe, myExe, sizeof(myExe));
    4749        if ( n < 0 ) {
    48                 perror( "readlink(/proc/self/exe ) error" );
     50                perror( "readlink( " exe " ) error" );
    4951                return 1;
    5052        } // if
     
    103105
    104106void check_core_pattern() {
     107        #define core_pattern "/proc/sys/kernel/core_pattern"
    105108        int ret;
    106         int cp = open( "/proc/sys/kernel/core_pattern", 0, O_RDONLY );
     109        int cp = open( core_pattern, 0, O_RDONLY );
    107110
    108111        if ( cp < 0 ) {
    109                 perror( "open(/proc/sys/kernel/core_pattern, O_RDONLY ) error" );
     112                perror( "open( " core_pattern ", 0, O_RDONLY ) error" );
    110113                return;
    111114        } // if
     
    128131        } finally {
    129132                ret = close( cp );
    130                 if ( ret < 0 ) perror( "close( /proc/sys/kernel/core_pattern ) error" );
     133                if ( ret < 0 ) perror( "close( " core_pattern " ) error" );
    131134        } // try
    132135}
Note: See TracChangeset for help on using the changeset viewer.