pkt-line: tighten sideband PACK check when tracing
[git/mingw/j6t.git] / pkt-line.c
blobe75af023b6e458203fa8854eb8305308fc62f619
1 #include "cache.h"
2 #include "pkt-line.h"
4 char packet_buffer[LARGE_PACKET_MAX];
5 static const char *packet_trace_prefix = "git";
6 static struct trace_key trace_packet = TRACE_KEY_INIT(PACKET);
8 void packet_trace_identity(const char *prog)
10 packet_trace_prefix = xstrdup(prog);
13 static void packet_trace(const char *buf, unsigned int len, int write)
15 int i;
16 struct strbuf out;
18 if (!trace_want(&trace_packet))
19 return;
21 /* +32 is just a guess for header + quoting */
22 strbuf_init(&out, len+32);
24 strbuf_addf(&out, "packet: %12s%c ",
25 packet_trace_prefix, write ? '>' : '<');
27 if (starts_with(buf, "PACK") || starts_with(buf, "\1PACK")) {
28 strbuf_addstr(&out, "PACK ...");
29 trace_disable(&trace_packet);
31 else {
32 /* XXX we should really handle printable utf8 */
33 for (i = 0; i < len; i++) {
34 /* suppress newlines */
35 if (buf[i] == '\n')
36 continue;
37 if (buf[i] >= 0x20 && buf[i] <= 0x7e)
38 strbuf_addch(&out, buf[i]);
39 else
40 strbuf_addf(&out, "\\%o", buf[i]);
44 strbuf_addch(&out, '\n');
45 trace_strbuf(&trace_packet, &out);
46 strbuf_release(&out);
50 * If we buffered things up above (we don't, but we should),
51 * we'd flush it here
53 void packet_flush(int fd)
55 packet_trace("0000", 4, 1);
56 write_or_die(fd, "0000", 4);
59 void packet_buf_flush(struct strbuf *buf)
61 packet_trace("0000", 4, 1);
62 strbuf_add(buf, "0000", 4);
65 #define hex(a) (hexchar[(a) & 15])
66 static void format_packet(struct strbuf *out, const char *fmt, va_list args)
68 static char hexchar[] = "0123456789abcdef";
69 size_t orig_len, n;
71 orig_len = out->len;
72 strbuf_addstr(out, "0000");
73 strbuf_vaddf(out, fmt, args);
74 n = out->len - orig_len;
76 if (n > LARGE_PACKET_MAX)
77 die("protocol error: impossibly long line");
79 out->buf[orig_len + 0] = hex(n >> 12);
80 out->buf[orig_len + 1] = hex(n >> 8);
81 out->buf[orig_len + 2] = hex(n >> 4);
82 out->buf[orig_len + 3] = hex(n);
83 packet_trace(out->buf + orig_len + 4, n - 4, 1);
86 void packet_write(int fd, const char *fmt, ...)
88 static struct strbuf buf = STRBUF_INIT;
89 va_list args;
91 strbuf_reset(&buf);
92 va_start(args, fmt);
93 format_packet(&buf, fmt, args);
94 va_end(args);
95 write_or_die(fd, buf.buf, buf.len);
98 void packet_buf_write(struct strbuf *buf, const char *fmt, ...)
100 va_list args;
102 va_start(args, fmt);
103 format_packet(buf, fmt, args);
104 va_end(args);
107 static int get_packet_data(int fd, char **src_buf, size_t *src_size,
108 void *dst, unsigned size, int options)
110 ssize_t ret;
112 if (fd >= 0 && src_buf && *src_buf)
113 die("BUG: multiple sources given to packet_read");
115 /* Read up to "size" bytes from our source, whatever it is. */
116 if (src_buf && *src_buf) {
117 ret = size < *src_size ? size : *src_size;
118 memcpy(dst, *src_buf, ret);
119 *src_buf += ret;
120 *src_size -= ret;
121 } else {
122 ret = read_in_full(fd, dst, size);
123 if (ret < 0)
124 die_errno("read error");
127 /* And complain if we didn't get enough bytes to satisfy the read. */
128 if (ret < size) {
129 if (options & PACKET_READ_GENTLE_ON_EOF)
130 return -1;
132 die("The remote end hung up unexpectedly");
135 return ret;
138 static int packet_length(const char *linelen)
140 int n;
141 int len = 0;
143 for (n = 0; n < 4; n++) {
144 unsigned char c = linelen[n];
145 len <<= 4;
146 if (c >= '0' && c <= '9') {
147 len += c - '0';
148 continue;
150 if (c >= 'a' && c <= 'f') {
151 len += c - 'a' + 10;
152 continue;
154 if (c >= 'A' && c <= 'F') {
155 len += c - 'A' + 10;
156 continue;
158 return -1;
160 return len;
163 int packet_read(int fd, char **src_buf, size_t *src_len,
164 char *buffer, unsigned size, int options)
166 int len, ret;
167 char linelen[4];
169 ret = get_packet_data(fd, src_buf, src_len, linelen, 4, options);
170 if (ret < 0)
171 return ret;
172 len = packet_length(linelen);
173 if (len < 0)
174 die("protocol error: bad line length character: %.4s", linelen);
175 if (!len) {
176 packet_trace("0000", 4, 0);
177 return 0;
179 len -= 4;
180 if (len >= size)
181 die("protocol error: bad line length %d", len);
182 ret = get_packet_data(fd, src_buf, src_len, buffer, len, options);
183 if (ret < 0)
184 return ret;
186 if ((options & PACKET_READ_CHOMP_NEWLINE) &&
187 len && buffer[len-1] == '\n')
188 len--;
190 buffer[len] = 0;
191 packet_trace(buffer, len, 0);
192 return len;
195 static char *packet_read_line_generic(int fd,
196 char **src, size_t *src_len,
197 int *dst_len)
199 int len = packet_read(fd, src, src_len,
200 packet_buffer, sizeof(packet_buffer),
201 PACKET_READ_CHOMP_NEWLINE);
202 if (dst_len)
203 *dst_len = len;
204 return len ? packet_buffer : NULL;
207 char *packet_read_line(int fd, int *len_p)
209 return packet_read_line_generic(fd, NULL, NULL, len_p);
212 char *packet_read_line_buf(char **src, size_t *src_len, int *dst_len)
214 return packet_read_line_generic(-1, src, src_len, dst_len);