{"thread":{"id":"311","subject":"git on solaris","startedAt":"2005-04-25T19:07:04Z","lastAt":"2005-04-25T19:07:04Z","messageCount":1,"participants":["Thomas Glanzmann"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"1643","messageId":"20050425190704.GB14076@cip.informatik.uni-erlangen.de","threadId":"311","inReplyTo":null,"subject":"git on solaris","fromName":"Thomas Glanzmann","fromEmail":"sithglan@stud.uni-erlangen.de","sentAt":"2005-04-25T19:07:04Z","receivedAt":"2005-04-25T19:07:04Z","isPatch":false,"sender":{"key":"sithglan@stud.uni-erlangen.de","avatar":null},"body":"Hello,\nthis patch makes git compile on Solaris, but it isn't considered for\nupstream at the moment.\n\n\tThomas\n\n\nIndex: Makefile\n===================================================================\n--- 648b1464afe31bf85116ca64734a8b8990f4e0da/Makefile  (mode:100644 sha1:022af9b8c0a8ded65892c84bd419e46af6d2ae92)\n+++ uncommitted/Makefile  (mode:100644)\n@@ -21,14 +21,14 @@\n all: $(PROG)\n \n install: $(PROG)\n-\tinstall $(PROG) $(HOME)/bin/\n+\tginstall $(PROG) $(HOME)/bin/\n \n LIB_OBJS=read-cache.o sha1_file.o usage.o object.o commit.o tree.o blob.o\n LIB_FILE=libgit.a\n LIB_H=cache.h object.h\n \n LIBS = $(LIB_FILE)\n-LIBS += -lz\n+LIBS += -lz -L /opt/csw/lib -lsocket -lnsl\n \n ifdef MOZILLA_SHA1\n   SHA1_HEADER=\"mozilla-sha1/sha1.h\"\n@@ -43,7 +43,7 @@\n endif\n endif\n \n-CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)'\n+CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)' -I/opt/csw/include -D_XOPEN_SOURCE_EXTENDED=1\n \n $(LIB_FILE): $(LIB_OBJS)\n \t$(AR) rcs $@ $(LIB_OBJS)\nIndex: rsh.c\n===================================================================\n--- 648b1464afe31bf85116ca64734a8b8990f4e0da/rsh.c  (mode:100644 sha1:4d6a90bf6c1b290975fb2ac22f25979be56cb476)\n+++ uncommitted/rsh.c  (mode:100644)\n@@ -1,6 +1,7 @@\n #include \"rsh.h\"\n \n #include <string.h>\n+#include <sys/types.h>\n #include <sys/socket.h>\n \n #include \"cache.h\"\n@@ -47,7 +48,7 @@\n \t\t}\n \t}\n \tstrcpy(posn, \" -\");\n-\tif (socketpair(AF_LOCAL, SOCK_STREAM, 0, sv)) {\n+\tif (socketpair(AF_UNIX, SOCK_STREAM, 0, sv)) {\n \t\treturn error(\"Couldn't create socket\");\n \t}\n \tif (!fork()) {\nIndex: show-files.c\n===================================================================\n--- 648b1464afe31bf85116ca64734a8b8990f4e0da/show-files.c  (mode:100644 sha1:b53ab1053e1acf7e2a1e9c97a4d87b76e8ee238e)\n+++ uncommitted/show-files.c  (mode:100644)\n@@ -51,6 +51,7 @@\n \n \tif (dir) {\n \t\tstruct dirent *de;\n+\t\tstruct stat st;\n \t\tchar fullname[MAXPATHLEN + 1];\n \t\tmemcpy(fullname, base, baselen);\n \n@@ -62,8 +63,8 @@\n \t\t\tlen = strlen(de->d_name);\n \t\t\tmemcpy(fullname + baselen, de->d_name, len+1);\n \n+#if __LINUX__\n \t\t\tswitch (de->d_type) {\n-\t\t\tstruct stat st;\n \t\t\tdefault:\n \t\t\t\tcontinue;\n \t\t\tcase DT_UNKNOWN:\n@@ -81,6 +82,17 @@\n \t\t\tcase DT_REG:\n \t\t\t\tbreak;\n \t\t\t}\n+#else\n+\t\t\tif (lstat(fullname, &st))\n+\t\t\t\tcontinue;\n+\t\t\tif (S_ISDIR(st.st_mode)) {\n+\t\t\t\tmemcpy(fullname + baselen + len, \"/\", 2);\n+\t\t\t\tread_directory(fullname, fullname, baselen + len + 1);\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\t\t\tif (!S_ISREG(st.st_mode))\n+\t\t\t\tbreak;\n+#endif\n \t\t\tadd_name(fullname, baselen + len);\n \t\t}\n \t\tclosedir(dir);\n"}]}