Changeset 3129 in orxonox.OLD for orxonox/branches

Timestamp:

Dec 7, 2004, 8:54:09 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/images: pathlist now also accepts Paths from Windows.

Location:

orxonox/branches/images/importer

Files:

• Makefile.in (modified) (8 diffs)
• material.cc (modified) (2 diffs)

orxonox/branches/images/importer/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
 # @configure_input@
 
@@ -42 +42 @@
 subdir = importer
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
+        $(srcdir)/Makefile.in TODO
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -50 +50 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
+am__installdirs = $(DESTDIR)$(bindir)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
@@ -206 +206 @@
 install-binPROGRAMS: $(bin_PROGRAMS)
         @$(NORMAL_INSTALL)
-        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+        $(mkdir_p) $(DESTDIR)$(bindir)
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
@@ -212 +212 @@
           ; then \
             f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
           else :; fi; \
         done
@@ -221 +221 @@
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-          rm -f "$(DESTDIR)$(bindir)/$$f"; \
+          echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+          rm -f $(DESTDIR)$(bindir)/$$f; \
         done
 
@@ -281 +281 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique; \
-        fi
+        test -z "$(ETAGS_ARGS)$$tags$$unique" \
+          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$tags $$unique
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
@@ -340 +338 @@
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
-        for dir in "$(DESTDIR)$(bindir)"; do \
-          test -z "$$dir" || $(mkdir_p) "$$dir"; \
-        done
+        $(mkdir_p) $(DESTDIR)$(bindir)
 install: install-am
 install-exec: install-exec-am

orxonox/branches/images/importer/material.cc

@@ -58 +58 @@
       return;
     }
-  
-  if (access (pName, F_OK) == 0)
+  char* tmpPName = new char[strlen(pName)];
+  strncpy(tmpPName, pName, strlen(pName)-1);
+
+  if (access (tmpPName, F_OK) == 0)
     {
       struct stat status;
-      stat(pName, &status);
+      stat(tmpPName, &status);
       if (status.st_mode & S_IFDIR)
         {
@@ -79 +81 @@
     if (verbose >=1)
       printf ("You tried to add non-existing folder %s to a PathList.\n", pName);
+  delete []tmpPName;
 }