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
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
|
--- zipup.c.orig 2008-01-12 22:29:14.000000000 -0800
+++ zipup.c 2008-01-12 22:36:00.000000000 -0800
@@ -139,6 +139,9 @@
#else
local int filetypes OF((char *, char *));
#endif
+#ifdef FORRISCOS
+ local int set_extra_field_forriscos OF((struct zlist far *z, iztimes *z_utim));
+#endif
local unsigned file_read OF((char *buf, unsigned size));
#ifdef USE_ZLIB
local int zl_deflate_init OF((int pack_level));
@@ -379,7 +382,133 @@
}
#endif /* ?RISCOS */
+#ifdef FORRISCOS
+
+int set_extra_field_forriscos(z, z_utim)
+ struct zlist far *z;
+ iztimes *z_utim;
+{
+#ifdef USE_EF_UT_TIME
+ char *eb_ptr;
+#endif /* USE_EF_UT_TIME */
+ char *cptr;
+ char *extra_block;
+ unsigned int addr;
+ unsigned int ftype = 0xfff; /* Untyped files default to 'text' */
+ unsigned timlo; /* 3 lower bytes of acorn file-time plus carry byte */
+ unsigned timhi; /* 2 high bytes of acorn file-time */
+
+#define EB_SPARK_LEN 20
+#define EB_SPARK_SIZE (EB_HEADSIZE+EB_SPARK_LEN)
+#ifdef USE_EF_UT_TIME
+# ifdef IZ_CHECK_TZ
+# define EB_UTTIME_SIZE (zp_tz_is_valid ? EB_HEADSIZE+EB_UT_LEN(1) : 0)
+# else
+# define EB_UTTIME_SIZE (EB_HEADSIZE+EB_UT_LEN(1))
+# endif
+#else
+# define EB_UTTIME_SIZE 0
+#endif
+#define EF_SPARK_TOTALSIZE (EB_SPARK_SIZE + EB_UTTIME_SIZE)
+
+ cptr=strrchr(z->iname, (int) ',');
+ if (cptr)
+ if ((cptr - z->iname) != (int)(strlen(z->iname)-4))
+ cptr = NULL; /* There was a comma, but it wasn't a ,xxx at the end! */
+
+ if (cptr)
+ {
+ *cptr='\0'; /* Chop the filename at the comma */
+
+ ftype = strtol(cptr+1, NULL, 16); /* read the ,xxx as hex filetype */
+ }
+ else
+ {
+ /* When there is no given filetype, but there is a full stop in the name,
+ then it is better to let the unzip utility in RISC OS do a MimeMap lookup
+ instead, and therefore do nothing here */
+ if (strchr(z->iname, '.'))
+ return ZE_OK;
+ }
+
+ z->extra=(char *)malloc(EF_SPARK_TOTALSIZE);
+ if (z->extra==NULL) {
+ fprintf(stderr," set_extra_field_forriscos: not enough memory\n");
+ return ZE_MEM;
+ }
+ z->cextra = z->extra;
+ z->cext = z->ext = EF_SPARK_TOTALSIZE;
+
+ timlo = ((unsigned)z_utim->mtime & 0x00ffffffU) * 100 + 0x00996a00U;
+ timhi = ((unsigned)z_utim->mtime >> 24);
+ timhi = timhi * 100 + 0x0000336eU + (timlo >> 24);
+
+ extra_block=z->extra;
+ /* ID */
+ extra_block[0]='A';
+ extra_block[1]='C';
+
+ /* size */
+ extra_block[2]=(char)(EB_SPARK_LEN);
+ extra_block[3]=(char)(EB_SPARK_LEN)>>8;
+
+ /* ID_2 */
+ extra_block[4]='A';
+ extra_block[5]='R';
+ extra_block[6]='C';
+ extra_block[7]='0';
+
+ /* Load address */
+ addr=0xfff00000 | (ftype << 8); /* This file is typed, and has filetype 'ftype' */
+ addr|= ((timhi >> 8) & 0xffU);
+ extra_block[8]=(char)(addr);
+ extra_block[9]=(char)(addr>>8);
+ extra_block[10]=(char)(addr>>16);
+ extra_block[11]=(char)(addr>>24);
+
+ /* Exec address */
+ addr=(timlo & 0x00ffffffU) | ((timhi & 0x000000ffU) << 24);
+ extra_block[12]=(char)(addr);
+ extra_block[13]=(char)(addr>>8);
+ extra_block[14]=(char)(addr>>16);
+ extra_block[15]=(char)(addr>>24);
+
+ /* Attributes */
+ extra_block[16]=0x13; /* Private read/write, no public access, unlocked */
+ extra_block[17]=0;
+ extra_block[18]=0;
+ extra_block[19]=0;
+
+ /* Zero */
+ extra_block[20]=0;
+ extra_block[21]=0;
+ extra_block[22]=0;
+ extra_block[23]=0;
+
+#ifdef USE_EF_UT_TIME
+# ifdef IZ_CHECK_TZ
+ if (zp_tz_is_valid) {
+# endif
+ eb_ptr = z->extra + EB_SPARK_SIZE;
+
+ eb_ptr[0] = 'U';
+ eb_ptr[1] = 'T';
+ eb_ptr[2] = EB_UT_LEN(1); /* length of data part of e.f. */
+ eb_ptr[3] = 0;
+ eb_ptr[4] = EB_UT_FL_MTIME;
+ eb_ptr[5] = (char)(z_utim->mtime);
+ eb_ptr[6] = (char)(z_utim->mtime >> 8);
+ eb_ptr[7] = (char)(z_utim->mtime >> 16);
+ eb_ptr[8] = (char)(z_utim->mtime >> 24);
+# ifdef IZ_CHECK_TZ
+ }
+# endif
+#endif /* USE_EF_UT_TIME */
+
+ return ZE_OK;
+}
+#endif /* FORRISCOS */
/* Note: a zip "entry" includes a local header (which includes the file
name), an encryption header if encrypting, the compressed data
@@ -552,6 +681,15 @@
#if !(defined(VMS) && defined(VMS_PK_EXTRA))
if (extra_fields) {
/* create extra field and change z->att and z->atx if desired */
+#ifdef FORRISCOS
+ if (decomma)
+ {
+ /* If we're making a zip for RISC OS, we don't bother with any other */
+ /* OS-Specific info (although we could - but there's no point!) */
+ set_extra_field_forriscos(z, &f_utim);
+ }
+ else
+#endif
set_extra_field(z, &f_utim);
# ifdef QLZIP
if(qlflag)
|
