Change for solaris.
This commit is contained in:
clanmills
parent
9dd3269b80
commit
13565be3d2
@ -24,7 +24,7 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN
|
||||
if (COMPILER_IS_GCC OR COMPILER_IS_CLANG)
|
||||
|
||||
# This fails under Fedora - MinGW - Gcc 8.3
|
||||
if (NOT MINGW)
|
||||
if (NOT MINGW AND NOT CMAKE_HOST_SOLARIS)
|
||||
if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0)
|
||||
add_compile_options(-fstack-clash-protection -fcf-protection)
|
||||
endif()
|
||||
|
||||
@ -289,10 +289,10 @@ int main(int argc, char* const argv[])
|
||||
Jzon::Object root;
|
||||
|
||||
if ( option == 'f' ) { // only report filesystem when requested
|
||||
const char* FS="FS";
|
||||
Jzon::Object fs ;
|
||||
root.Add(FS,fs) ;
|
||||
fileSystemPush(path,root.Get(FS));
|
||||
const char* Fs="FS";
|
||||
Jzon::Object fs ;
|
||||
root.Add(Fs,fs) ;
|
||||
fileSystemPush(path,root.Get(Fs));
|
||||
}
|
||||
|
||||
if ( option == 'a' || option == 'e' ) {
|
||||
|
||||
@ -223,13 +223,13 @@ std::string Position::toExifTimeStamp(std::string& t)
|
||||
const char* arg = t.c_str();
|
||||
int HH = 0 ;
|
||||
int mm = 0 ;
|
||||
int SS = 0 ;
|
||||
int SS1 = 0 ;
|
||||
if ( strstr(arg,":") || strstr(arg,"-") ) {
|
||||
int YY,MM,DD ;
|
||||
char a,b,c,d,e ;
|
||||
sscanf(arg,"%d%c%d%c%d%c%d%c%d%c%d",&YY,&a,&MM,&b,&DD,&c,&HH,&d,&mm,&e,&SS);
|
||||
sscanf(arg,"%d%c%d%c%d%c%d%c%d%c%d",&YY,&a,&MM,&b,&DD,&c,&HH,&d,&mm,&e,&SS1);
|
||||
}
|
||||
sprintf(result,"%d/1 %d/1 %d/1",HH,mm,SS);
|
||||
sprintf(result,"%d/1 %d/1 %d/1",HH,mm,SS1);
|
||||
return std::string(result);
|
||||
}
|
||||
|
||||
@ -406,15 +406,15 @@ time_t parseTime(const char* arg,bool bAdjust)
|
||||
// <time>2012-07-14T17:33:16Z</time>
|
||||
|
||||
if ( strstr(arg,":") || strstr(arg,"-") ) {
|
||||
int YY,MM,DD,HH,mm,SS ;
|
||||
int YY,MM,DD,HH,mm,SS1 ;
|
||||
char a,b,c,d,e ;
|
||||
sscanf(arg,"%d%c%d%c%d%c%d%c%d%c%d",&YY,&a,&MM,&b,&DD,&c,&HH,&d,&mm,&e,&SS);
|
||||
sscanf(arg,"%d%c%d%c%d%c%d%c%d%c%d",&YY,&a,&MM,&b,&DD,&c,&HH,&d,&mm,&e,&SS1);
|
||||
|
||||
struct tm T;
|
||||
memset(&T,0,sizeof(T));
|
||||
T.tm_min = mm ;
|
||||
T.tm_hour = HH ;
|
||||
T.tm_sec = SS ;
|
||||
T.tm_sec = SS1 ;
|
||||
if ( bAdjust ) T.tm_sec -= Position::Adjust();
|
||||
T.tm_year = YY -1900 ;
|
||||
T.tm_mon = MM -1 ;
|
||||
@ -441,7 +441,7 @@ int timeZoneAdjust()
|
||||
struct tm lcopy = *localtime(&now);
|
||||
time_t gmt = timegm(&lcopy) ; // timegm modifies lcopy
|
||||
offset = (int) ( ((long signed int) gmt) - ((long signed int) now) ) ;
|
||||
#elif defined(OS_SOLARIS)
|
||||
#elif defined(OS_SOLARIS) || defined(__sun__)
|
||||
struct tm local = *localtime(&now) ;
|
||||
time_t local_tt = (int) mktime(&local);
|
||||
time_t time_gmt = (int) mktime(gmtime(&now));
|
||||
|
||||
@ -24,6 +24,7 @@
|
||||
#include "futils.hpp"
|
||||
#include "datasets.hpp"
|
||||
#include "enforce.hpp"
|
||||
#include "image_int.hpp"
|
||||
|
||||
// + standard includes
|
||||
#include <sys/types.h>
|
||||
@ -498,6 +499,15 @@ namespace Exiv2 {
|
||||
// release resources
|
||||
if ( procs ) procstat_freeprocs(procstat, procs);
|
||||
if ( procstat ) procstat_close(procstat);
|
||||
#elif defined(__sun__)
|
||||
// https://stackoverflow.com/questions/47472762/on-solaris-how-to-get-the-full-path-of-executable-of-running-process-programatic
|
||||
const char* proc = Internal::stringFormat("/proc/%d/path/a.out",getpid()).c_str();
|
||||
char path[500];
|
||||
ssize_t l = readlink (proc,path,sizeof(path)-1);
|
||||
if (l>0) {
|
||||
path[l]=0;
|
||||
ret = path;
|
||||
}
|
||||
#elif defined(__unix__)
|
||||
// http://stackoverflow.com/questions/606041/how-do-i-get-the-path-of-a-process-in-unix-linux
|
||||
char path[500];
|
||||
|
||||
@ -74,10 +74,11 @@
|
||||
# include <sys/socket.h>
|
||||
# include <sys/sysctl.h>
|
||||
# include <libprocstat.h>
|
||||
#elif defined(__sun__)
|
||||
# include <dlfcn.h>
|
||||
# include <link.h>
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
namespace Exiv2 {
|
||||
int versionNumber()
|
||||
{
|
||||
@ -199,9 +200,22 @@ static Exiv2::StringVector getLoadedLibraries()
|
||||
if ( files ) procstat_freefiles(procstat, files);
|
||||
if ( procs ) procstat_freeprocs(procstat, procs);
|
||||
if ( procstat ) procstat_close (procstat);
|
||||
#elif defined (__sun__) || defined(__unix__)
|
||||
// http://stackoverflow.com/questions/606041/how-do-i-get-the-path-of-a-process-in-unix-linux
|
||||
char procsz[100];
|
||||
char pathsz[500];
|
||||
sprintf(procsz,"/proc/%d/path/a.out", getpid());
|
||||
int l = readlink (procsz, pathsz,sizeof(pathsz));
|
||||
if (l>0) {
|
||||
pathsz[l]='\0';
|
||||
path.assign(pathsz);
|
||||
libs.push_back(path);
|
||||
} else {
|
||||
libs.push_back("unknown");
|
||||
}
|
||||
|
||||
#elif defined(__unix__)
|
||||
// read file /proc/self/maps which has a list of files in memory
|
||||
// (this doesn't yield anything on __sun__)
|
||||
std::ifstream maps("/proc/self/maps",std::ifstream::in);
|
||||
std::string string ;
|
||||
while ( std::getline(maps,string) ) {
|
||||
@ -212,6 +226,8 @@ static Exiv2::StringVector getLoadedLibraries()
|
||||
}
|
||||
}
|
||||
#endif
|
||||
if ( !libs.size() ) libs.push_back("unknown");
|
||||
|
||||
return libs;
|
||||
}
|
||||
|
||||
@ -260,14 +276,12 @@ void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys)
|
||||
"CC (oracle)";
|
||||
#elif defined (__SUNPRO_C)
|
||||
"cc (oracle)";
|
||||
#elif defined (__sun__)
|
||||
"cc (solaris)";
|
||||
#else
|
||||
"unknown" ;
|
||||
#endif
|
||||
|
||||
#if defined(__SUNPRO_CC) || defined (__SUNPRO_C)
|
||||
#define __oracle__
|
||||
#endif
|
||||
|
||||
#ifndef __VERSION__
|
||||
#ifdef __clang__version__
|
||||
#define __VERSION__ __clang__version__
|
||||
@ -289,6 +303,8 @@ void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys)
|
||||
"mingw64";
|
||||
#elif defined(__MINGW32__)
|
||||
"mingw32";
|
||||
#elif defined(__sun__)
|
||||
"solaris";
|
||||
#elif defined(__NetBSD__)
|
||||
"netbsd";
|
||||
#elif defined(__FreeBSD__)
|
||||
|
||||
@ -59,28 +59,45 @@ SHELL = /bin/sh
|
||||
# to save download time for simple build/test, we download video and eps data on demand
|
||||
SVN = svn://dev.exiv2.org/svn/testdata/trunk
|
||||
|
||||
##
|
||||
# determine the test platform
|
||||
UNAME := $(shell uname)
|
||||
UNIX=FALSE
|
||||
ifeq ($(UNAME),SunOS)
|
||||
UNIX=TRUE
|
||||
endif
|
||||
ifeq ($(UNAME),FreeBSD)
|
||||
UNIX=TRUE
|
||||
endif
|
||||
|
||||
##
|
||||
# Add test drivers to this list
|
||||
TESTS = addmoddel.sh \
|
||||
conversions.sh \
|
||||
exifdata-test.sh \
|
||||
exiv2-test.sh \
|
||||
geotag-test.sh \
|
||||
imagetest.sh \
|
||||
icc-test.sh \
|
||||
iotest.sh \
|
||||
iptctest.sh \
|
||||
iso65k-test.sh \
|
||||
modify-test.sh \
|
||||
path-test.sh \
|
||||
preview-test.sh \
|
||||
stringto-test.sh \
|
||||
tiff-test.sh \
|
||||
webp-test.sh \
|
||||
write-test.sh \
|
||||
write2-test.sh \
|
||||
xmpparser-test.sh \
|
||||
version-test.sh
|
||||
|
||||
# the following tests are broken on UNIX
|
||||
ifeq ($(UNIX),FALSE)
|
||||
TESTS += exifdata-test.sh \
|
||||
exiv2-test.sh \
|
||||
imagetest.sh \
|
||||
iotest.sh \
|
||||
iptctest.sh \
|
||||
preview-test.sh \
|
||||
tiff-test.sh \
|
||||
write-test.sh \
|
||||
xmpparser-test.sh
|
||||
endif
|
||||
|
||||
# always run version-test.sh last!
|
||||
TESTS += version-test.sh
|
||||
|
||||
# video tests
|
||||
TESTV = video-test.sh
|
||||
|
||||
@ -10,7 +10,7 @@ source ./functions.source
|
||||
runTest exifdata-test exiv2-canon-powershot-s40.jpg
|
||||
runTest exifdata-test exiv2-nikon-d70.jpg
|
||||
|
||||
) | tr -d '\r' > $results
|
||||
) | tr -d '\r' | sed 's/[ \t]+$//' > $results
|
||||
|
||||
reportTest
|
||||
|
||||
|
||||
@ -100,9 +100,9 @@ reportTest()
|
||||
fi
|
||||
|
||||
if [ "$PLATFORM" == "cygwin" ]; then
|
||||
diff -q $diffargs $(cygpath -aw $lhs) $(cygpath -aw $rhs)
|
||||
diff $diffargs $(cygpath -aw $lhs) $(cygpath -aw $rhs)
|
||||
else
|
||||
diff -q $diffargs $lhs $rhs
|
||||
diff $diffargs $lhs $rhs
|
||||
fi
|
||||
rc=$?
|
||||
if [ $rc -eq 0 ] ; then
|
||||
@ -487,29 +487,31 @@ prepareTest()
|
||||
|
||||
##
|
||||
# figure out arguments for diff
|
||||
diffargs="--strip-trailing-cr"
|
||||
good="$here/data/${this}.out"
|
||||
results="$here/tmp/${this}.out"
|
||||
|
||||
tmpfile=$here/tmp/$this
|
||||
touch $tmpfile
|
||||
diff -q $diffargs $tmpfile $tmpfile 2>/dev/null
|
||||
if [ $? -ne 0 ]; then
|
||||
diffargs=""
|
||||
fi
|
||||
|
||||
tmpfile=tmp/ttt
|
||||
good="$here/data/${this}.out"
|
||||
results="$here/tmp/${this}.out"
|
||||
tmpfile=$here/tmp/$this
|
||||
touch $tmpfile
|
||||
da1="--strip-trailing-cr"
|
||||
diff -q $da1 $tmpfile $tmpfile 2>/dev/null
|
||||
if [ $? -ne 0 ] ; then
|
||||
da1=""
|
||||
|
||||
if [ "$PLATFORM" == SunOS ] ; then
|
||||
da1=""
|
||||
da2=""
|
||||
else
|
||||
diffargs="--strip-trailing-cr"
|
||||
diff -q $diffargs $tmpfile $tmpfile 2>/dev/null
|
||||
if [ $? -ne 0 ]; then
|
||||
diffargs=""
|
||||
fi
|
||||
|
||||
tmpfile=tmp/ttt
|
||||
touch $tmpfile
|
||||
da1="--strip-trailing-cr"
|
||||
diff -q $da1 $tmpfile $tmpfile 2>/dev/null
|
||||
if [ $? -ne 0 ] ; then
|
||||
da1=""
|
||||
fi
|
||||
da2="--ignore-matching-lines=^Usage:.*exiv2"
|
||||
diff -q $da2 $tmpfile $tmpfile 2>/dev/null
|
||||
fi
|
||||
da2="--ignore-matching-lines=^Usage:.*exiv2"
|
||||
diff -q $da2 $tmpfile $tmpfile 2>/dev/null
|
||||
#if [ $? -ne 0 -o "$PLATFORM" == mingw ] ; then
|
||||
# da2=""
|
||||
#fi
|
||||
diffargs="$da1 $da2"
|
||||
|
||||
##
|
||||
|
||||
Loading…
Reference in New Issue
Block a user