ruby-dev

前田です。

>>>>> In [ruby-dev:3773]
>>>>> "前田" == MAEDA Shugo <shugo@aianet.ne.jp> san wrote:

前田> 手元のmmencodeが、なぜか-oオプションを処理してくれないようなので、
前田> pack("M")/unpack("M")を実装して、mmencode.rbというのを書いてみました。

前田> [2 pack.c.diff.gz <application/octet-stream (base64)>]

すいません、これは捨てて、こちらを使ってください。


-- 
前田 修吾 (mailto:shugo@aianet.ne.jp)

Attachments (1)

pack.c.diff (3 KB, text/x-diff)

--- pack.c.orig	Tue Dec  8 00:12:12 1998
+++ pack.c	Wed Dec  9 13:37:12 1998
@@ -77,6 +77,7 @@
 static char *toofew = "too few arguments";
 
 static void encodes _((VALUE,char*,int,int));
+static void qpencode _((VALUE,VALUE,int));
 
 static void
 pack_add_ptr(str, add)
@@ -469,6 +470,13 @@
 	    }
 	    break;
 
+	  case 'M':
+	    from = obj_as_string(NEXTFROM);
+	    if (len <= 1)
+		len = 72;
+	    qpencode(res, from, len);
+	    break;
+
 	  case 'P':
 	    len = 1;
 	    /* FALL THROUGH */
@@ -539,6 +547,86 @@
     str_cat(str, "\n", 1);
 }
 
+static char hex_table[] = "0123456789ABCDEF";
+
+static void
+qpencode(str, from, len)
+    VALUE str, from;
+    int len;
+{
+    char buff[1024];
+    int i = 0, n = 0, prev = EOF;
+    unsigned char *s = RSTRING(from)->ptr;
+    unsigned char *send = s + RSTRING(from)->len;
+
+    while (s < send) {
+        if ((*s > 126) ||
+	    (*s < 32 && *s != '\n' && *s != '\t') ||
+	    (*s == '=')) {
+	    buff[i++] = '=';
+	    buff[i++] = hex_table[*s >> 4];
+	    buff[i++] = hex_table[*s & 0x0f];
+            n += 3;
+            prev = EOF;
+        }
+	else if (*s == '\n') {
+            if (prev == ' ' || prev == '\t') {
+		buff[i++] = '=';
+		buff[i++] = *s;
+            }
+	    buff[i++] = *s;
+            n = 0;
+            prev = *s;
+        }
+	else {
+	    buff[i++] = *s;
+            n++;
+            prev = *s;
+        }
+        if (n > len) {
+	    buff[i++] = '=';
+	    buff[i++] = '\n';
+            n = 0;
+            prev = '\n';
+        }
+	if (i > 1024 - 5) {
+	    str_cat(str, buff, i);
+	    i = 0;
+	}
+	s++;
+    }
+    if (n > 0) {
+	buff[i++] = '=';
+	buff[i++] = '\n';
+    }
+    if (i > 0) {
+	str_cat(str, buff, i);
+    }
+}
+
+#if defined(__GNUC__) && __GNUC__ >= 2 && !defined(RUBY_NO_INLINE)
+static __inline__ int
+#else
+static int
+#endif
+hex2num(c)
+    char c;
+{
+    switch (c) {
+    case '0': case '1': case '2': case '3': case '4':
+    case '5': case '6': case '7': case '8': case '9':
+        return c - '0';
+    case 'a': case 'b': case 'c':
+    case 'd': case 'e': case 'f':
+	return c - 'a' + 10;
+    case 'A': case 'B': case 'C':
+    case 'D': case 'E': case 'F':
+	return c - 'A' + 10;
+    default:
+	return -1;
+    }
+}
+
 static VALUE
 pack_unpack(str, fmt)
     VALUE str, fmt;
@@ -923,6 +1011,32 @@
 		if (a != -1 && b != -1 && c != -1 && s[3] == '=') {
 		    *ptr++ = a << 2 | b >> 4;
 		    *ptr++ = b << 4 | c >> 2;
+		}
+		RSTRING(str)->len = ptr - RSTRING(str)->ptr;
+		ary_push(ary, str);
+	    }
+	    break;
+
+	  case 'M':
+	    {
+		VALUE str = str_new(0, send - s);
+		char *ptr = RSTRING(str)->ptr;
+		int c1, c2;
+
+		while (s < send) {
+		    if (*s == '=') {
+			if (++s == send) break;
+			if (*s != '\n' && s < send - 1) {
+			    if ((c1 = hex2num(*s)) == -1) break;
+			    if (++s == send) break;
+			    if ((c2 = hex2num(*s)) == -1) break;
+			    *ptr++ = c1 << 4 | c2;
+			}
+		    }
+		    else {
+			*ptr++ = *s;
+		    }
+		    s++;
 		}
 		RSTRING(str)->len = ptr - RSTRING(str)->ptr;
 		ary_push(ary, str);

Thread

Prev Next

In This Thread

Prev Next

[#3726] str_new — ttate@...

[#3731] Re: [ruby-list:11138] Re: 拡張モジュールの Makefile — Motoyuki Kasahara <m-kasahr@...>

[#3733] Re: about ext/{tk,tcltklib}/Makefile — WATANABE Hirofumi <watanabe@...>

[#3747] constants (or class vriable?) — Wakou Aoyama <wakou@...>

[#3749] Error message in dln.c(Win32) — WATANABE Hirofumi <watanabe@...>

[#3773] pack("M")/unpack("M") — shugo@... (MAEDA Shugo)

[#3794] port NetBSD/ alpha 1.3I — SHIROYAMA Takayuki <psi@...>

[#3808] 予告 : ruby 1.1d0 release is coming soon. — matz@... (Yukihiro Matsumoto)

[#3826] ruby 1.1d0 released — matz@... (Yukihiro Matsumoto)

[#3827] Method Defining Method — Shin-ichro Hara <sinara@...>

[#3836] "make test" is something wrong (ruby-1.1d0) — ttate@...

[#3846] Re: ruby 1.1d0 released — 助田 雅紀 <masaki.suketa@...>

[#3848] instruby.rb (patch for 1.1d0) — ttate@...

[#3849] Re: ruby 1.1d0 released — SHIROYAMA Takayuki <psi@...>

[#3851] tkutil patch (for 1.1d0) — ttate@...

[#3857] [patch] enum.c — shugo@... (MAEDA Shugo)

[#3859] missing/setenv.c in 1.1d0 — Inaba Hiroto <inaba@...>

[#3862] 1.1d0 new here document — Wakou Aoyama <wakou@...>

[#3864] make bug? ruby-1.1d0 — Yutaka Matsumoto <ymatsu@...>

[#3873] (?: ) does not work? — shugo@... (MAEDA Shugo)

[#3881] I want to catch all jump — shugo@... (Shugo Maeda)

[#3882] subscribe — Koji Oda <oda@...1.qnes.nec.co.jp>

[#3894] ruby 1.1d1 released — matz@... (Yukihiro Matsumoto)

[#3899] interpreter reinitialization — shugo@... (Shugo Maeda)

[#3950] Re: version number — 助田 雅紀 <masaki.suketa@...>

[#3962] ruby 1.3(!) released — matz@... (Yukihiro Matsumoto)

[#3966] [BUG] exception in safe level 4 — shugo@... (Shugo Maeda)

[#3983] compile error in gc.c — Fukuda Masaki <fukuda@...>

[#3986] Re: [ruby-list:11444] ruby 1.2 released — Hiroshi Igarashi <igarashi@...>

[#3997] [BUG] "#{}" while 1 — gotoken@... (GOTO Kentaro)

[#4002] config.guess — Koji Arai <JCA02266@...>

[#4005] [BUG] ruby 1.3(98/12/24) [i686-linux] at rb_gc_mark() — Ryo HAYASAKA <hayasaka@...>

[#4015] Integer proper methods — gotoken@... (GOTO Kentaro)

[#4030] module Precision — gotoken@... (GOTO Kentaro)

[#4032] [Req] make-symbol? — shugo@... (Shugo Maeda)

[#4035] about philos.rb — ttate@...

[#4041] static — gotoken@... (GOTO Kentaro)

[ruby-dev:3783] Re: pack("M")/unpack("M")

Attachments (1)

Thread

In This Thread

[#3846] Re: ruby 1.1d0 released — 助田　雅紀 <masaki.suketa@...>

[#3950] Re: version number — 助田　雅紀 <masaki.suketa@...>