search for binary in pwd

adiff/src/adiff.cpp

@@ -12,8 +12,9 @@
 #include <string.h>
 #include <err.h>
 #include <stdlib.h>
-#define PROGNAME    "adiff.%s"
+#include <sys/stat.h>
+#define PROGNAME    "%s/adiff.%s"
 #define VERSION     "0.0.1"
 int main(int argc, char *argv[]) {
@@ -47,16 +48,26 @@ more:
 	if (optind == argc || difftype == NULL) {
 		fprintf(stderr, "Usage: adiff [-V] -t difftype [diff-options] input1 input2");
 		return EXIT_FAILURE;
-	} else {
-		char* program_name = (char*) malloc(sizeof(PROGNAME) - 2 + strlen(difftype) + 1);
-		sprintf(program_name, PROGNAME, difftype);
-		if (verbose)
-			argv[--optind] = (char*) "-V";
-		argv[--optind] = program_name;
-		execvp(program_name, argv + optind);
-		perror(program_name);
-		return EXIT_FAILURE;
-	}
+	}
+	
+	char* pwd = get_current_dir_name();
+	int pwdlen = strlen(pwd) + 1;
+	
+	char* program_name = (char*) malloc(pwdlen + sizeof(PROGNAME) - 3 + strlen(difftype) + 1);
+	sprintf(program_name, PROGNAME, pwd, difftype);
+	
+	struct stat buffer;
+	if(stat (program_name, &buffer) == 1) {
+		program_name += pwdlen;
+		pwdlen = 0;
+	}
+	
+	if (verbose)
+		argv[--optind] = (char*) "-V";
+	argv[--optind] = program_name + pwdlen;
+	execvp(program_name, argv + optind);
+	perror(program_name);
+	return EXIT_FAILURE;
 }