1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
|
+uudeview (0.5.20-3) unstable; urgency=low
+
+ * Ack NMU. (closes: Bug#373630)
+ * Don't force overwrite mode if auto-rename enabled. (closes: Bug#378076)
+ * Don't ignore special chars when parsing MIME. (closes: Bug#341440)
+ * Fix for #320541 also fixes #242999. (closes: Bug#242999)
+ * Incorporate suspicious-file patch from Peter Muir. (closes: Bug#166077)
...
+ -- Chris Hanson <cph@debian.org> Tue, 15 Aug 2006 00:40:50 -0400
Index: uudeview-0.5.20/unix/uudeview.c
===================================================================
--- uudeview-0.5.20.orig/unix/uudeview.c
+++ uudeview-0.5.20/unix/uudeview.c
@@ -657,9 +657,6 @@ work_comline (int argc, char *argv[])
else switch (*(argv[number] + 1)) {
case '\0':
interact = 0;
- if (overwrite == 0) {
- overwrite = 1;
- }
proc_stdin ();
break;
case 'a':
@@ -699,10 +696,7 @@ work_comline (int argc, char *argv[])
fprintf (stderr, "WARNING: cannot interact when reading from stdin\n");
}
else {
- interact = (*argv[number] == '+') ? 1 : 0;
- if (overwrite == 0 && *argv[number] == '-') {
- overwrite = 1;
- }
+ interact = (*argv[number] == '+') ? 1 : 0;
}
break;
case 'm':
@@ -773,6 +767,8 @@ work_comline (int argc, char *argv[])
break;
}
}
+ if (overwrite == 0 && interact == 0 && autoren == 0)
+ overwrite = 1;
return 1;
}
Index: uudeview-0.5.20/uulib/uunconc.c
===================================================================
--- uudeview-0.5.20.orig/uulib/uunconc.c
+++ uudeview-0.5.20/uulib/uunconc.c
@@ -1437,6 +1437,9 @@ UUDecode (uulist *data)
res = UURET_IOERR;
break;
}
+ UUMessage (uunconc_id, __LINE__, UUMSG_MESSAGE,
+ uustring (S_OPEN_FILE),
+ iter->data->sfname);
_FP_strncpy (uugen_fnbuffer, iter->data->sfname, 1024);
}
Index: uudeview-0.5.20/uulib/uuscan.c
===================================================================
--- uudeview-0.5.20.orig/uulib/uuscan.c
+++ uudeview-0.5.20/uulib/uuscan.c
@@ -387,10 +387,10 @@ ParseValue (char *attribute)
*attribute != '(' && *attribute != ')' &&
*attribute != '<' && *attribute != '>' &&
*attribute != '@' && *attribute != ',' &&
- /* *attribute != ';' && */ *attribute != ':' &&
- *attribute != '\\' &&*attribute != '"' &&
- *attribute != '/' && /* *attribute != '[' &&
- *attribute != ']' && */ *attribute != '?' &&
+ *attribute != ';' && *attribute != ':' &&
+ *attribute != '\\' && *attribute != '"' &&
+ *attribute != '/' && *attribute != '[' &&
+ *attribute != ']' && *attribute != '?' &&
*attribute != '=' && length < 255) {
*ptr++ = *attribute++;
length++;
Index: uudeview-0.5.20/uulib/uustring.c
===================================================================
--- uudeview-0.5.20.orig/uulib/uustring.c
+++ uudeview-0.5.20/uulib/uustring.c
@@ -107,6 +107,7 @@ static stringmap messages[] = {
{ S_MIME_B_NOT_FOUND, "Boundary expected on Multipart message but found EOF" },
{ S_MIME_MULTI_DEPTH, "Multipart message nested too deep" },
{ S_MIME_PART_MULTI, "Handling partial multipart message as plain text" },
+ { S_OPEN_FILE, "Opened file %s" },
{ 0, "" }
};
Index: uudeview-0.5.20/uulib/uustring.h
===================================================================
--- uudeview-0.5.20.orig/uulib/uustring.h
+++ uudeview-0.5.20/uulib/uustring.h
@@ -36,3 +36,4 @@
#define S_MIME_B_NOT_FOUND 35
#define S_MIME_MULTI_DEPTH 36
#define S_MIME_PART_MULTI 37
+#define S_OPEN_FILE 38
|