Skip to content

Instantly share code, notes, and snippets.

@trickart
Created August 2, 2016 03:30
Show Gist options
  • Save trickart/4fb9af322069028973be543befb54325 to your computer and use it in GitHub Desktop.
Save trickart/4fb9af322069028973be543befb54325 to your computer and use it in GitHub Desktop.
diff -u -r '--exclude=.git' kirk_engine_old/common/utils.c kirk_engine/common/utils.c
--- kirk_engine_old/common/utils.c 2016-08-02 12:14:08.101645239 +0900
+++ kirk_engine/common/utils.c 2016-08-02 12:09:29.525335002 +0900
@@ -6,7 +6,7 @@
#include <stdlib.h>
#include <dirent.h>
#include <sys/stat.h>
-#include <io.h>
+//#include <io.h>
@@ -233,8 +233,8 @@
break;
*p = 0;
- //mkdir(name, 0777);
- mkdir(name);
+ mkdir(name, 0777);
+ //mkdir(name);
*p = '/';
cp = p+1;
};
diff -u -r '--exclude=.git' kirk_engine_old/common/utils.h kirk_engine/common/utils.h
--- kirk_engine_old/common/utils.h 2016-08-02 12:14:08.101645239 +0900
+++ kirk_engine/common/utils.h 2016-08-02 12:08:33.774073069 +0900
@@ -5,6 +5,8 @@
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
#define NELEMS(a) (sizeof(a) / sizeof(a[0]))
+typedef unsigned char u8;
+
void hex_dump(const char *str, void *addr, int size);
diff -u -r '--exclude=.git' kirk_engine_old/fake_np/Makefile kirk_engine/fake_np/Makefile
--- kirk_engine_old/fake_np/Makefile 2016-08-02 12:14:08.101645239 +0900
+++ kirk_engine/fake_np/Makefile 2016-08-02 12:08:33.774073069 +0900
@@ -1,5 +1,5 @@
CC = gcc
-CFLAGS = -Wall -I../kirk -I../common
+CFLAGS = -Wall -I../kirk -I../common -Wl,--allow-multiple-definition
TARGET = fake_np
OBJS = fake_np.o isoreader.o ../common/utils.o ../npdpc/tlzrc.o
diff -u -r '--exclude=.git' kirk_engine_old/fake_np/fake_np.c kirk_engine/fake_np/fake_np.c
--- kirk_engine_old/fake_np/fake_np.c 2016-08-02 12:14:08.104978649 +0900
+++ kirk_engine/fake_np/fake_np.c 2016-08-02 12:08:33.774073069 +0900
@@ -8,6 +8,8 @@
#include <string.h>
#include "utils.h"
+typedef unsigned char u8;
+
#include "kirk_engine.h"
#include "amctrl.h"
diff -u -r '--exclude=.git' kirk_engine_old/fake_np/isoreader.c kirk_engine/fake_np/isoreader.c
--- kirk_engine_old/fake_np/isoreader.c 2016-08-02 12:14:08.104978649 +0900
+++ kirk_engine/fake_np/isoreader.c 2016-08-02 12:10:41.303626838 +0900
@@ -296,7 +296,7 @@
if (0 == strcmp(name, file)) {
if (is_dir) {
- if(!rec->fileFlags & ISO9660_FILEFLAGS_DIR) {
+ if(!rec->fileFlags && ISO9660_FILEFLAGS_DIR) {
return -14;
}
}
Only in kirk_engine/npdpc: tlzrc.o
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment