Changeset 14314

Timestamp:

Jul 3, 2014, 9:58:39 PM (8 years ago)

Author:

jordan

Message:

(trunk, libT) mike.dld's 4160-02a-path.patch: portability wrapper around file paths.

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (5 diffs)
• libtransmission/Makefile.am (modified) (4 diffs)
• libtransmission/file-posix.c (added)
• libtransmission/file-test.c (added)
• libtransmission/file-win32.c (added)
• libtransmission/file.h (added)
• libtransmission/utils.c (modified) (1 diff)
• libtransmission/utils.h (modified) (1 diff)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -461 +461 @@
                 C1077A4E183EB29600634C22 /* error.c in Sources */ = {isa = PBXBuildFile; fileRef = C1077A4A183EB29600634C22 /* error.c */; };
                 C1077A4F183EB29600634C22 /* error.h in Headers */ = {isa = PBXBuildFile; fileRef = C1077A4B183EB29600634C22 /* error.h */; };
+                C1077A50183EB29600634C22 /* file-posix.c in Sources */ = {isa = PBXBuildFile; fileRef = C1077A4C183EB29600634C22 /* file-posix.c */; };
+                C1077A51183EB29600634C22 /* file.h in Headers */ = {isa = PBXBuildFile; fileRef = C1077A4D183EB29600634C22 /* file.h */; };
                 D4AF3B2F0C41F7A500D46B6B /* list.c in Sources */ = {isa = PBXBuildFile; fileRef = D4AF3B2D0C41F7A500D46B6B /* list.c */; };
                 D4AF3B300C41F7A600D46B6B /* list.h in Headers */ = {isa = PBXBuildFile; fileRef = D4AF3B2E0C41F7A500D46B6B /* list.h */; };
@@ -1197 +1199 @@
                 C1077A4A183EB29600634C22 /* error.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = error.c; path = libtransmission/error.c; sourceTree = "<group>"; };
                 C1077A4B183EB29600634C22 /* error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = error.h; path = libtransmission/error.h; sourceTree = "<group>"; };
+                C1077A4C183EB29600634C22 /* file-posix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "file-posix.c"; path = "libtransmission/file-posix.c"; sourceTree = "<group>"; };
+                C1077A4D183EB29600634C22 /* file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = file.h; path = libtransmission/file.h; sourceTree = "<group>"; };
                 D4AF3B2D0C41F7A500D46B6B /* list.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = list.c; path = libtransmission/list.c; sourceTree = "<group>"; };
                 D4AF3B2E0C41F7A500D46B6B /* list.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = list.h; path = libtransmission/list.h; sourceTree = "<group>"; };
@@ -1653 +1657 @@
                                 C1077A4A183EB29600634C22 /* error.c */,
                                 C1077A4B183EB29600634C22 /* error.h */,
+                                C1077A4C183EB29600634C22 /* file-posix.c */,
+                                C1077A4D183EB29600634C22 /* file.h */,
                                 4D80185710BBC0B0008A4AF2 /* magnet.c */,
                                 4D80185810BBC0B0008A4AF2 /* magnet.h */,
@@ -2048 +2054 @@
                         buildActionMask = 2147483647;
                         files = (
+                                C1077A51183EB29600634C22 /* file.h in Headers */,
                                 BEFC1E290C07861A00B0BB3C /* version.h in Headers */,
                                 BEFC1E2A0C07861A00B0BB3C /* utils.h in Headers */,
@@ -2679 +2686 @@
                                 4D36BA740CA2F00800A63CA5 /* peer-io.c in Sources */,
                                 4D36BA770CA2F00800A63CA5 /* peer-mgr.c in Sources */,
+                                C1077A50183EB29600634C22 /* file-posix.c in Sources */,
                                 4D36BA790CA2F00800A63CA5 /* peer-msgs.c in Sources */,
                                 A25D2CBD0CF4C73E0096A262 /* stats.c in Sources */,

trunk/libtransmission/Makefile.am

@@ -73 +73 @@
   wildmat.c
 
+if WIN32
+libtransmission_a_SOURCES += file-win32.c
+else
+libtransmission_a_SOURCES += file-posix.c
+endif
+
 noinst_HEADERS = \
   announcer.h \
@@ -86 +92 @@
   error.h \
   fdlimit.h \
+  file.h \
   handshake.h \
   history.h \
@@ -137 +144 @@
   crypto-test \
   error-test \
+  file-test \
   history-test \
   json-test \
@@ -192 +200 @@
 error_test_LDFLAGS = ${apps_ldflags}
 
+file_test_SOURCES = file-test.c $(TEST_SOURCES)
+file_test_LDADD = ${apps_ldadd}
+file_test_LDFLAGS = ${apps_ldflags}
+
 history_test_SOURCES = history-test.c $(TEST_SOURCES)
 history_test_LDADD = ${apps_ldadd}

trunk/libtransmission/utils.c

@@ -1317 +1317 @@
 }
 
+#ifdef WIN32
+
+char *
+tr_win32_native_to_utf8 (const wchar_t * text,
+                         int             text_size)
+{
+  char * ret = NULL;
+  int size;
+
+  size = WideCharToMultiByte (CP_UTF8, 0, text, text_size, NULL, 0, NULL, NULL);
+  if (size == 0)
+    goto fail;
+
+  ret = tr_new (char, size + 1);
+  size = WideCharToMultiByte (CP_UTF8, 0, text, text_size, ret, size, NULL, NULL);
+  if (size == 0)
+    goto fail;
+
+  ret[size] = '\0';
+
+  return ret;
+
+fail:
+  tr_free (ret);
+
+  return NULL;
+}
+
+wchar_t *
+tr_win32_utf8_to_native (const char * text,
+                         int          text_size)
+{
+  return tr_win32_utf8_to_native_ex (text, text_size, 0);
+}
+
+wchar_t *
+tr_win32_utf8_to_native_ex (const char * text,
+                            int          text_size,
+                            int          extra_chars)
+{
+  wchar_t * ret = NULL;
+  int size;
+
+  size = MultiByteToWideChar (CP_UTF8, 0, text, text_size, NULL, 0);
+  if (size == 0)
+    goto fail;
+
+  ret = tr_new (wchar_t, size + extra_chars + 1);
+  size = MultiByteToWideChar (CP_UTF8, 0, text, text_size, ret, size);
+  if (size == 0)
+    goto fail;
+
+  ret[size] = L'\0';
+
+  return ret;
+
+fail:
+  tr_free (ret);
+
+  return NULL;
+}
+
+char *
+tr_win32_format_message (uint32_t code)
+{
+  wchar_t * wide_text = NULL;
+  DWORD wide_size;
+  char * text = NULL;
+  size_t text_size;
+
+  wide_size = FormatMessageW (FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                              FORMAT_MESSAGE_FROM_SYSTEM |
+                              FORMAT_MESSAGE_IGNORE_INSERTS,
+                              NULL, code, 0, (LPWSTR)&wide_text, 0, NULL);
+
+  if (wide_size != 0 && wide_text != NULL)
+    text = tr_win32_native_to_utf8 (wide_text, wide_size);
+
+  LocalFree (wide_text);
+
+  /* Most (all?) messages contain "\r\n" in the end, chop it */
+  text_size = strlen (text);
+  while (text_size > 0 &&
+         text[text_size - 1] >= '\0' &&
+         text[text_size - 1] <= ' ')
+    text[--text_size] = '\0';
+
+  return text;
+}
+
+#endif
+
 /***
 ****

trunk/libtransmission/utils.h

@@ -179 +179 @@
 char* tr_utf8clean (const char * str, int len) TR_GNUC_MALLOC;
 
+#ifdef WIN32
+
+char    * tr_win32_native_to_utf8    (const wchar_t * text,
+                                      int             text_size);
+wchar_t * tr_win32_utf8_to_native    (const char    * text,
+                                      int             text_size);
+wchar_t * tr_win32_utf8_to_native_ex (const char    * text,
+                                      int             text_size,
+                                      int             extra_chars);
+char    * tr_win32_format_message    (uint32_t        code);
+
+#endif
 
 /***