svn commit: r1198394 - in /thrift/trunk/lib/rb/ext: strlcpy.c struct.c

[jf...@apache.org]

Author: jfarrell
Date: Sun Nov  6 16:07:45 2011
New Revision: 1198394

URL: http://svn.apache.org/viewvc?rev=1198394&view=rev
Log:
Thrift-1382: Bundle install doesnot work because thrift crashes
Client: ruby
Patch: Jake Farrell

Fixes strlcpy header include issue with ruby 1.9.x.


Added:
    thrift/trunk/lib/rb/ext/strlcpy.c
Modified:
    thrift/trunk/lib/rb/ext/struct.c

Added: thrift/trunk/lib/rb/ext/strlcpy.c
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/ext/strlcpy.c?rev=1198394&view=auto
==============================================================================
--- thrift/trunk/lib/rb/ext/strlcpy.c (added)
+++ thrift/trunk/lib/rb/ext/strlcpy.c Sun Nov  6 16:07:45 2011
@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#include <string.h>
+
+#ifndef HAVE_STRLCPY
+#define HAVE_STRLCPY
+
+size_t
+strlcpy (char *dst, const char *src, size_t dst_sz)
+{
+    size_t n;
+
+    for (n = 0; n < dst_sz; n++) {
+      if ((*dst++ = *src++) == '\0')
+        break;
+    }
+
+    if (n < dst_sz)
+      return n;
+    if (n > 0)
+      *(dst - 1) = '\0';
+    return n + strlen (src);
+}
+#else
+extern size_t strlcpy(char *, const char *, size_t);
+#endif
+

Modified: thrift/trunk/lib/rb/ext/struct.c
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/ext/struct.c?rev=1198394&r1=1198393&r2=1198394&view=diff
==============================================================================
--- thrift/trunk/lib/rb/ext/struct.c (original)
+++ thrift/trunk/lib/rb/ext/struct.c Sun Nov  6 16:07:45 2011
@@ -21,33 +21,6 @@
 #include "constants.h"
 #include "macros.h"
 
-#ifndef HAVE_STRLCPY
-
-static
-size_t
-strlcpy (char *dst, const char *src, size_t dst_sz)
-{
-    size_t n;
-
-    for (n = 0; n < dst_sz; n++) {
-      if ((*dst++ = *src++) == '\0')
-        break;
-    }
-
-    if (n < dst_sz)
-      return n;
-    if (n > 0)
-      *(dst - 1) = '\0';
-    return n + strlen (src);
-}
-#else
-/*
-   Ruby 1.9.x includes the OpenBSD implementation of strlcpy.
-   See missing/strlcpy.c in Ruby 1.9 source
- */
-extern size_t strlcpy(char *, const char *, size_t);
-#endif
-
 VALUE thrift_union_class;
 
 ID setfield_id;