Changeset 8fee84 in git


Ignore:
Timestamp:
Nov 22, 2011, 7:49:28 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')
Children:
075570ccace50ed5c0162e781b6bc18b6b3cd77b1374bcb770246a4d1aa093134c432cb6e4dec131a43cca5ec664cb599240d68933581729ed0c9d9ab04606b8b49ee529a32068d798d52eb959785b71
Parents:
82102f7983746e8c06470cef72757bccdc4e7ba9
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-22 19:49:28+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-23 01:56:36+01:00
Message:
libfindexec separation

CHG: no need in 'ifdef HAVE_CONFIG_H' in omFindExec.c (not used in any
configure anymore)
CHG: separation/removal of omFindExec from omalloc & xalloc
ADD: use new findexec library
Files:
1 added
14 edited
2 moved

Legend:

Unmodified
Added
Removed
  • Makefile.am

    r82102f r8fee84  
    99endif
    1010 
    11 PACKAGES=$(ALLOC) $(USE_FACTORY) libpolys kernel numeric Singular
     11PACKAGES=findexec $(ALLOC) $(USE_FACTORY) libpolys kernel numeric Singular
    1212
    1313SUBDIRS=$(PACKAGES)
  • Singular/Makefile.am

    r82102f r8fee84  
    178178# handle all the generated *.inc
    179179
    180 AM_LDFLAGS = -L${abs_top_builddir}/Singular -L${abs_top_builddir}/numeric -L${abs_top_builddir}/kernel -L${abs_top_builddir}/libpolys/polys  $(USE_FACTORY) -L${abs_top_builddir}/omalloc
     180AM_LDFLAGS = -L${abs_top_builddir}/Singular -L${abs_top_builddir}/numeric -L${abs_top_builddir}/kernel -L${abs_top_builddir}/libpolys/polys  $(USE_FACTORY) -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/findexec
    181181
    182182noinst_PROGRAMS = gentable2 gentable1 feOpt feOptES feOptTS
     
    221221Singularg_SOURCES = tesths.cc
    222222
    223 Singular_LDADD = libSingular.la -lnumeric -lkernel -lpolys $(FACTORY_LIBS) -lomalloc $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    224 Singularg_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
     223Singular_LDADD = libSingular.la -lnumeric -lkernel -lpolys $(FACTORY_LIBS) -lomalloc -lfindexec $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
     224Singularg_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    225225
    226226Singular_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     
    243243nodist_Singulardg_SOURCES =  libSingular_g.la
    244244
    245 Singulard_LDADD = libSingular.la -lnumeric -lkernel -lpolys $(FACTORY_LIBS) -lomalloc $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    246 Singulardg_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
     245Singulard_LDADD = libSingular.la -lnumeric -lkernel -lpolys $(FACTORY_LIBS) -lomalloc -lfindexec $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
     246Singulardg_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    247247
    248248Singulard_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     
    284284test_s_g_SOURCES = test.cc
    285285
    286 test_s_r_LDADD = libSingular.la -lnumeric -lkernel -lpolys $(FACTORY_LIBS) -lomalloc $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    287 test_s_g_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
     286test_s_r_LDADD = libSingular.la -lnumeric -lkernel -lpolys $(FACTORY_LIBS) -lomalloc -lfindexec $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
     287test_s_g_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    288288
    289289test_s_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     
    305305test_d_g_SOURCES = test.cc
    306306
    307 test_d_r_LDADD = libSingular.la -lnumeric -lkernel -lpolys $(FACTORY_LIBS) -lomalloc $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    308 test_d_g_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
     307test_d_r_LDADD = libSingular.la -lnumeric -lkernel -lpolys $(FACTORY_LIBS) -lomalloc -lfindexec $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
     308test_d_g_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    309309
    310310test_d_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
  • Singular/fehelp.cc

    r82102f r8fee84  
    2121#include <kernel/febase.h>
    2222#include <reporter/reporter.h>
     23
     24#include <findexec/omFindExec.h>
    2325
    2426#include "ipid.h"
  • configure.ac

    r82102f r8fee84  
    3434  fi
    3535fi
     36
     37
     38AC_HEADER_STDC
     39AC_CHECK_HEADERS(unistd.h)
     40
     41AC_CHECK_FUNCS(readlink getcwd getwd)
     42
    3643
    3744AC_PROG_CPP
     
    8996
    9097AC_CONFIG_SUBDIRS(libpolys)
    91 
    9298AC_CONFIG_FILES([Makefile])
     99AC_CONFIG_FILES([findexec/Makefile])
    93100AC_CONFIG_FILES([kernel/Makefile])
    94101AC_CONFIG_FILES([numeric/Makefile])
  • findexec/omFindExec.c

    r82102f r8fee84  
    77 *******************************************************************/
    88
    9 #ifdef HAVE_CONFIG_H
    10 #include <omalloc/omConfig.h>
    11 #endif
     9#include "config.h"
    1210
    1311#if defined(HAVE_UNISTD_H) && defined(STDC_HEADERS)
     
    1614#include <unistd.h> /* always defiend */
    1715#endif
     16
    1817#include <stdlib.h>
    1918#include <string.h>
    2019
    21 #include <omalloc/omFindExec.h>
     20#include "omFindExec.h"
    2221
    2322#ifndef MAXPATHLEN
  • findexec/omFindExec.h

    r82102f r8fee84  
    99#define OM_FIND_EXEC_H
    1010
     11#ifdef __cplusplus
     12extern "C" {
     13#endif
     14
    1115/* determines absolute pathname of program prog, writes it into exec */
    1216/* returns exec on succes, NULL on failure */
    1317char* omFindExec(const char* prog, char* exec);
    1418
     19#ifdef __cplusplus
     20}
     21#endif
     22
    1523#endif /* OM_FINDEXEC_H */
  • kernel/Makefile.am

    r82102f r8fee84  
    8181endif
    8282
    83 AM_LDFLAGS = -L${top_builddir}/kernel -L${top_builddir}/libpolys/polys -L${top_builddir}/libpolys/coeffs -L${top_builddir}/libpolys/reporter -L${top_builddir}/libpolys/resources -L${top_builddir}/libpolys/misc $(USE_FACTORY) -L${top_builddir}/omalloc
     83AM_LDFLAGS = -L${top_builddir}/kernel -L${top_builddir}/libpolys/polys -L${top_builddir}/libpolys/coeffs -L${top_builddir}/libpolys/reporter -L${top_builddir}/libpolys/resources -L${top_builddir}/libpolys/misc $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/findexec
    8484
    8585
     
    100100test_s_g_SOURCES = $(testsources)
    101101
    102 test_s_r_LDADD = -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc $(FACTORY_LIBS) -lomalloc $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    103 test_s_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
     102test_s_r_LDADD = -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lfindexec $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
     103test_s_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    104104
    105105test_s_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     
    119119test_d_g_SOURCES = $(testsources)
    120120
    121 test_d_r_LDADD = -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc $(FACTORY_LIBS) -lomalloc $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    122 test_d_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
     121test_d_r_LDADD = -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lfindexec $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
     122test_d_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    123123
    124124test_d_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
  • libpolys/coeffs/Makefile.am

    r82102f r8fee84  
    4242
    4343## for testing...
    44 AM_LDFLAGS = -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/resources -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc
     44AM_LDFLAGS = -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/resources -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${top_builddir}/../findexec
    4545
    4646
     
    5959
    6060
    61 test_s_r_LDADD = -lcoeffs -lresources -lreporter -lmisc ${FACTORY_LIBS} -lomalloc ${NTL_LIBS} ${GMP_LIBS}
    62 test_s_g_LDADD = -lcoeffs_g -lresources_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g ${NTL_LIBS} ${GMP_LIBS}
     61test_s_r_LDADD = -lcoeffs -lresources -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
     62test_s_g_LDADD = -lcoeffs_g -lresources_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
    6363
    64 test_d_r_LDADD = -lcoeffs -lresources -lreporter -lmisc ${FACTORY_LIBS} -lomalloc ${NTL_LIBS} ${GMP_LIBS}
    65 test_d_g_LDADD = -lcoeffs_g -lresources_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g ${NTL_LIBS} ${GMP_LIBS}
     64test_d_r_LDADD = -lcoeffs -lresources -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
     65test_d_g_LDADD = -lcoeffs_g -lresources_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
     66
    6667
    6768
  • libpolys/libpolys-config.in

    r82102f r8fee84  
    6969
    7070    --libsg)
    71         ${ECHOn} " -L${libdir} -L${libdir}/singular -lpolys_g @FACTORY_LIBS@ -lomalloc_g @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
     71        ${ECHOn} " -L${libdir} -L${libdir}/singular -lpolys_g @FACTORY_LIBS@ -lomalloc_g -lfindexec_g @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
    7272        ;;
    7373
    7474    --libs)
    75         ${ECHOn} " -L${libdir} -L${libdir}/singular -lpolys @FACTORY_LIBS@ -lomalloc @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
     75        ${ECHOn} " -L${libdir} -L${libdir}/singular -lpolys @FACTORY_LIBS@ -lomalloc -lfindexec @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
    7676        ;;
    7777
  • libpolys/resources/feResource.cc

    r82102f r8fee84  
    1515#include "config.h"
    1616#include <misc/auxiliary.h>
     17
     18#include <findexec/omFindExec.h>
    1719
    1820#include "feResource.h"
  • libpolys/tests/Makefile.am

    r82102f r8fee84  
    9999rings_test_s_g_CPPFLAGS = ${DEBUGCPPFLAGS}
    100100
    101 AM_LDFLAGS = -L${top_builddir}/polys -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/resources -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc
     101AM_LDFLAGS = -L${top_builddir}/polys -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/resources -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${top_builddir}/../findexec
    102102
    103103coeffs_test_s_r_LDFLAGS = ${AM_LDFLAGS} -static
     
    118118
    119119
    120 coeffs_test_s_r_LDADD = -lcoeffs -lresources -lreporter -lmisc ${FACTORY_LIBS} -lomalloc ${NTL_LIBS} ${GMP_LIBS}
    121 polys_test_s_r_LDADD = -lpolys ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc ${NTL_LIBS} ${GMP_LIBS}
     120coeffs_test_s_r_LDADD = -lcoeffs -lresources -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
     121polys_test_s_r_LDADD = -lpolys ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
    122122rings_test_s_r_LDADD = $(polys_test_s_r_LDADD)
    123123
    124 coeffs_test_s_g_LDADD = -lcoeffs_g -lresources_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g ${NTL_LIBS} ${GMP_LIBS}
    125 polys_test_s_g_LDADD = -lpolys_g ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc_g ${NTL_LIBS} ${GMP_LIBS}
     124coeffs_test_s_g_LDADD = -lcoeffs_g -lresources_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
     125polys_test_s_g_LDADD = -lpolys_g ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
    126126rings_test_s_g_LDADD = $(polys_test_s_g_LDADD)
    127127
    128 coeffs_test_d_r_LDADD = -lcoeffs -lresources -lreporter -lmisc ${FACTORY_LIBS} -lomalloc ${NTL_LIBS} ${GMP_LIBS}
    129 polys_test_d_r_LDADD = -lpolys ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc ${NTL_LIBS} ${GMP_LIBS}
     128coeffs_test_d_r_LDADD = -lcoeffs -lresources -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
     129polys_test_d_r_LDADD = -lpolys ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
    130130rings_test_d_r_LDADD = $(polys_test_d_r_LDADD)
    131131
    132 coeffs_test_d_g_LDADD = -lcoeffs_g -lresources_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g ${NTL_LIBS} ${GMP_LIBS}
    133 polys_test_d_g_LDADD = -lpolys_g ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc_g ${NTL_LIBS} ${GMP_LIBS}
     132coeffs_test_d_g_LDADD = -lcoeffs_g -lresources_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
     133polys_test_d_g_LDADD = -lpolys_g ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
    134134rings_test_d_g_LDADD = $(polys_test_d_g_LDADD)
    135135
  • libsingular-config.in

    r82102f r8fee84  
    6969
    7070    --libsg)
    71         ${ECHOn} " -L${libdir} -L${libdir}/singular -lSingular_g -lkernel_g -lpolys_g @FACTORY_LIBS@ -lomalloc_g @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
     71        ${ECHOn} " -L${libdir} -L${libdir}/singular -lSingular_g -lkernel_g -lpolys_g @FACTORY_LIBS@ -lomalloc_g -lfindexec_g @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
    7272        ;;
    7373
    7474    --libs)
    75         ${ECHOn} " -L${libdir} -L${libdir}/singular -lSingular -lkernel -lpolys @FACTORY_LIBS@ -lomalloc @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
     75        ${ECHOn} " -L${libdir} -L${libdir}/singular -lSingular -lkernel -lpolys @FACTORY_LIBS@ -lomalloc -lfindexec @NTL_LIBS@ @USEPPROCSDYNAMICLD@ @GMP_LIBS@"
    7676        ;;
    7777
  • omalloc/Makefile.am

    r82102f r8fee84  
    99omError.h               omStructs.h             omAllocDecl.h           \
    1010omInlineDecl.h          omBin.h                 omMemOps.h              \
    11 omList.h                omFindExec.h            omGetBackTrace.h        \
     11omList.h                omGetBackTrace.h        \
    1212omRet2Info.h            omStats.h               omOpts.h                \
    1313omBinPage.h             omAllocSystem.h         \
     
    2222om_Alloc.c        omDebugCheck.c   omOpts.c         omGetBackTrace.c \
    2323omAllocSystem.c   omError.c        omStats.c        omRet2Info.c     \
    24 omBin.c           omFindExec.c     omDebugTrack.c                    \
     24omBin.c           omDebugTrack.c                     \
    2525omalloc_provide.c omAllocFunc.c
    2626
  • omalloc/configure.ac

    r82102f r8fee84  
    128128AC_CHECK_HEADERS(limits.h,,
    129129  AC_MSG_ERROR(Can not compile without limits.h))
     130
    130131AC_CHECK_HEADERS(unistd.h sys/mman.h fcntl.h /usr/include/malloc.h)
    131132
    132 AC_CHECK_FUNCS(popen readlink getcwd getwd mmap sbrk random)
     133AC_CHECK_FUNCS(popen mmap sbrk random)
    133134
    134135dnl llllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
     
    496497#include "omGetBackTrace.h"
    497498#include "omRet2Info.c"
    498 #include "omFindExec.c"
    499 
    500499
    501500int test_Ret_2_Info()
  • omalloc/omRet2Info.c

    r82102f r8fee84  
    1818#include <omalloc/omStructs.h>
    1919#include <omalloc/omRet2Info.h>
    20 #include <omalloc/omFindExec.h>
    2120#include <omalloc/omGetBackTrace.h>
    2221
     
    3635void omInitRet_2_Info(const char* argv0)
    3736{
    38   char buf[MAXPATHLEN];
    39 
    40   if (argv0 != NULL && omFindExec(argv0, buf))
    41   {
    42     strcpy(om_this_prog, buf);
     37//  char buf[MAXPATHLEN];
     38
     39  if (argv0 != NULL) // // && omFindExec(argv0, buf))
     40  {
     41    strncpy(om_this_prog, argv0, MAXPATHLEN); // // buf);
     42    om_this_prog[MAXPATHLEN - 1]= '\0';   
    4343  }
    4444}
  • omalloc/omalloc.h

    r82102f r8fee84  
    2626#include <omalloc/omMemOps.h>
    2727#include <omalloc/omList.h>
    28 #include <omalloc/omFindExec.h>
    2928#include <omalloc/omGetBackTrace.h>
    3029#include <omalloc/omRet2Info.h>
Note: See TracChangeset for help on using the changeset viewer.