From: José Fonseca <jfonseca@vmware.com>
Date: Fri, 13 Mar 2009 16:16:00 +0000 (+0000)
Subject: progs: Try to read the texture from the current dir, if full path fails.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e5a3aa5672af11f69daa67182123cdf353eecbde;p=mesa.git

progs: Try to read the texture from the current dir, if full path fails.
---

diff --git a/progs/util/readtex.c b/progs/util/readtex.c
index 37d5fcd0d3a..8e923b6eb47 100644
--- a/progs/util/readtex.c
+++ b/progs/util/readtex.c
@@ -102,9 +102,15 @@ static rawImageRec *RawImageOpen(const char *fileName)
       fprintf(stderr, "Out of memory!\n");
       return NULL;
    }
-   if ((raw->file = fopen(fileName, "rb")) == NULL) {
-      perror(fileName);
-      return NULL;
+   raw->file = fopen(fileName, "rb");
+   if (raw->file == NULL) {
+      const char *baseName = strrchr(fileName, '/');
+      if(baseName)
+         raw->file = fopen(baseName + 1, "rb");
+      if(raw->file == NULL) {
+         perror(fileName);
+         return NULL;
+      }
    }
 
    fread(raw, 1, 12, raw->file);