MonetDB: geo - Merge with default branch.

[Stefan Manegold]

Changeset: 87e45d1b625d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=87e45d1b625d
Modified Files:
        clients/mapiclient/tachograph.c
        clients/mapiclient/tomograph.c
Branch: geo
Log Message:

Merge with default branch.


diffs (30 lines):

diff --git a/clients/mapiclient/tachograph.c b/clients/mapiclient/tachograph.c
--- a/clients/mapiclient/tachograph.c
+++ b/clients/mapiclient/tachograph.c
@@ -960,9 +960,9 @@ main(int argc, char **argv)
        doQ(buf);
        if( cache){
 #ifdef NATIVE_WIN32
-               if( access(cache,F_OK) && _mkdir(cache)){
+               if( _mkdir(cache) < 0 && errno != EEXIST){
 #else
-               if( access(cache,F_OK) && mkdir(cache,0755) ) {
+               if( mkdir(cache,0755)  < 0 && errno != EEXIST) {
 #endif
                        fprintf(stderr,"Failed to create cache '%s'\n",cache);
                        exit(-1);
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -1735,9 +1735,9 @@ main(int argc, char **argv)
        /* reprocess an existing profiler trace, possibly producing the trace 
split   */
        if (cache) {
 #ifdef NATIVE_WIN32
-               if( access(cache, F_OK) && _mkdir(cache)){
+               if( _mkdir(cache) < 0 && errno != EEXIST){
 #else
-               if( access(cache, F_OK) &&  mkdir(cache,0755) ) {
+               if( mkdir(cache,0755)  < 0 && errno != EEXIST) {
 #endif
                        fprintf(stderr,"Failed to create cache '%s'\n",cache);
                        exit(-1);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list