Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 1 | From 03553ccc6284a437576349b5a3c2ed0d7d4265e1 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 15 Dec 2022 14:04:10 -0800 |
| 4 | Subject: [PATCH] aplay,axfer: Replace off64_t with off_t |
| 5 | |
| 6 | Also replace lseek64 with lseek. |
| 7 | |
| 8 | _FILE_OFFSET_BITS=64 is passed to needed platforms since configure uses |
| 9 | AC_SYS_LARGEFILE macro. Therefore off_t is already 64-bit and lseek is |
| 10 | same as lseek64. |
| 11 | |
| 12 | Additionally this fixes buils with latest musl where these lfs64 |
| 13 | functions are moved out from _GNU_SOURCE and under _LARGEFILE64_SOURCE |
| 14 | macro alone. This makes the builds fail on 32-bit platforms even though |
| 15 | default off_t on musl is 64-bit always. |
| 16 | |
| 17 | Upstream-Status: Submitted [https://github.com/alsa-project/alsa-utils/pull/183] |
| 18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 19 | --- |
| 20 | aplay/aplay.c | 44 ++++++++++++++++++------------------- |
| 21 | axfer/container-voc.c | 2 +- |
| 22 | axfer/container.c | 6 ++--- |
| 23 | axfer/container.h | 2 +- |
| 24 | axfer/test/container-test.c | 4 ++-- |
| 25 | axfer/test/mapper-test.c | 2 +- |
| 26 | 6 files changed, 30 insertions(+), 30 deletions(-) |
| 27 | |
| 28 | diff --git a/aplay/aplay.c b/aplay/aplay.c |
| 29 | index 6ce7191..bd93be3 100644 |
| 30 | --- a/aplay/aplay.c |
| 31 | +++ b/aplay/aplay.c |
| 32 | @@ -141,7 +141,7 @@ static long term_c_lflag = -1; |
| 33 | static int dump_hw_params = 0; |
| 34 | |
| 35 | static int fd = -1; |
| 36 | -static off64_t pbrec_count = LLONG_MAX, fdcount; |
| 37 | +static off_t pbrec_count = LLONG_MAX, fdcount; |
| 38 | static int vocmajor, vocminor; |
| 39 | |
| 40 | static char *pidfile_name = NULL; |
| 41 | @@ -2356,7 +2356,7 @@ static void voc_play(int fd, int ofs, char *name) |
| 42 | u_char *data, *buf; |
| 43 | char was_extended = 0, output = 0; |
| 44 | u_short *sp, repeat = 0; |
| 45 | - off64_t filepos = 0; |
| 46 | + off_t filepos = 0; |
| 47 | |
| 48 | #define COUNT(x) nextblock -= x; in_buffer -= x; data += x |
| 49 | #define COUNT1(x) in_buffer -= x; data += x |
| 50 | @@ -2490,7 +2490,7 @@ static void voc_play(int fd, int ofs, char *name) |
| 51 | d_printf("Repeat loop %d times\n", repeat); |
| 52 | #endif |
| 53 | if (filepos >= 0) { /* if < 0, one seek fails, why test another */ |
| 54 | - if ((filepos = lseek64(fd, 0, 1)) < 0) { |
| 55 | + if ((filepos = lseek(fd, 0, 1)) < 0) { |
| 56 | error(_("can't play loops; %s isn't seekable\n"), name); |
| 57 | repeat = 0; |
| 58 | } else { |
| 59 | @@ -2512,7 +2512,7 @@ static void voc_play(int fd, int ofs, char *name) |
| 60 | else |
| 61 | d_printf("Neverending loop\n"); |
| 62 | #endif |
| 63 | - lseek64(fd, filepos, 0); |
| 64 | + lseek(fd, filepos, 0); |
| 65 | in_buffer = 0; /* clear the buffer */ |
| 66 | goto Fill_the_buffer; |
| 67 | } |
| 68 | @@ -2578,9 +2578,9 @@ static void init_raw_data(void) |
| 69 | } |
| 70 | |
| 71 | /* calculate the data count to read from/to dsp */ |
| 72 | -static off64_t calc_count(void) |
| 73 | +static off_t calc_count(void) |
| 74 | { |
| 75 | - off64_t count; |
| 76 | + off_t count; |
| 77 | |
| 78 | if (timelimit == 0) |
| 79 | if (sampleslimit == 0) |
| 80 | @@ -2589,7 +2589,7 @@ static off64_t calc_count(void) |
| 81 | count = snd_pcm_format_size(hwparams.format, sampleslimit * hwparams.channels); |
| 82 | else { |
| 83 | count = snd_pcm_format_size(hwparams.format, hwparams.rate * hwparams.channels); |
| 84 | - count *= (off64_t)timelimit; |
| 85 | + count *= (off_t)timelimit; |
| 86 | } |
| 87 | return count < pbrec_count ? count : pbrec_count; |
| 88 | } |
| 89 | @@ -2750,7 +2750,7 @@ static void begin_au(int fd, size_t cnt) |
| 90 | /* closing .VOC */ |
| 91 | static void end_voc(int fd) |
| 92 | { |
| 93 | - off64_t length_seek; |
| 94 | + off_t length_seek; |
| 95 | VocBlockType bt; |
| 96 | size_t cnt; |
| 97 | char dummy = 0; /* Write a Terminator */ |
| 98 | @@ -2770,15 +2770,15 @@ static void end_voc(int fd) |
| 99 | bt.datalen = (u_char) (cnt & 0xFF); |
| 100 | bt.datalen_m = (u_char) ((cnt & 0xFF00) >> 8); |
| 101 | bt.datalen_h = (u_char) ((cnt & 0xFF0000) >> 16); |
| 102 | - if (lseek64(fd, length_seek, SEEK_SET) == length_seek) |
| 103 | + if (lseek(fd, length_seek, SEEK_SET) == length_seek) |
| 104 | xwrite(fd, &bt, sizeof(VocBlockType)); |
| 105 | } |
| 106 | |
| 107 | static void end_wave(int fd) |
| 108 | { /* only close output */ |
| 109 | WaveChunkHeader cd; |
| 110 | - off64_t length_seek; |
| 111 | - off64_t filelen; |
| 112 | + off_t length_seek; |
| 113 | + off_t filelen; |
| 114 | u_int rifflen; |
| 115 | |
| 116 | length_seek = sizeof(WaveHeader) + |
| 117 | @@ -2788,20 +2788,20 @@ static void end_wave(int fd) |
| 118 | cd.length = fdcount > 0x7fffffff ? LE_INT(0x7fffffff) : LE_INT(fdcount); |
| 119 | filelen = fdcount + 2*sizeof(WaveChunkHeader) + sizeof(WaveFmtBody) + 4; |
| 120 | rifflen = filelen > 0x7fffffff ? LE_INT(0x7fffffff) : LE_INT(filelen); |
| 121 | - if (lseek64(fd, 4, SEEK_SET) == 4) |
| 122 | + if (lseek(fd, 4, SEEK_SET) == 4) |
| 123 | xwrite(fd, &rifflen, 4); |
| 124 | - if (lseek64(fd, length_seek, SEEK_SET) == length_seek) |
| 125 | + if (lseek(fd, length_seek, SEEK_SET) == length_seek) |
| 126 | xwrite(fd, &cd, sizeof(WaveChunkHeader)); |
| 127 | } |
| 128 | |
| 129 | static void end_au(int fd) |
| 130 | { /* only close output */ |
| 131 | AuHeader ah; |
| 132 | - off64_t length_seek; |
| 133 | + off_t length_seek; |
| 134 | |
| 135 | length_seek = (char *)&ah.data_size - (char *)&ah; |
| 136 | ah.data_size = fdcount > 0xffffffff ? 0xffffffff : BE_INT(fdcount); |
| 137 | - if (lseek64(fd, length_seek, SEEK_SET) == length_seek) |
| 138 | + if (lseek(fd, length_seek, SEEK_SET) == length_seek) |
| 139 | xwrite(fd, &ah.data_size, sizeof(ah.data_size)); |
| 140 | } |
| 141 | |
| 142 | @@ -2828,11 +2828,11 @@ static void header(int rtype, char *name) |
| 143 | |
| 144 | /* playing raw data */ |
| 145 | |
| 146 | -static void playback_go(int fd, size_t loaded, off64_t count, int rtype, char *name) |
| 147 | +static void playback_go(int fd, size_t loaded, off_t count, int rtype, char *name) |
| 148 | { |
| 149 | int l, r; |
| 150 | - off64_t written = 0; |
| 151 | - off64_t c; |
| 152 | + off_t written = 0; |
| 153 | + off_t c; |
| 154 | |
| 155 | header(rtype, name); |
| 156 | set_params(); |
| 157 | @@ -3202,7 +3202,7 @@ static void capture(char *orig_name) |
| 158 | int filecount=0; /* number of files written */ |
| 159 | char *name = orig_name; /* current filename */ |
| 160 | char namebuf[PATH_MAX+2]; |
| 161 | - off64_t count, rest; /* number of bytes to capture */ |
| 162 | + off_t count, rest; /* number of bytes to capture */ |
| 163 | struct stat statbuf; |
| 164 | |
| 165 | /* get number of bytes to capture */ |
| 166 | @@ -3273,7 +3273,7 @@ static void capture(char *orig_name) |
| 167 | /* capture */ |
| 168 | fdcount = 0; |
| 169 | while (rest > 0 && recycle_capture_file == 0 && !in_aborting) { |
| 170 | - size_t c = (rest <= (off64_t)chunk_bytes) ? |
| 171 | + size_t c = (rest <= (off_t)chunk_bytes) ? |
| 172 | (size_t)rest : chunk_bytes; |
| 173 | size_t f = c * 8 / bits_per_frame; |
| 174 | size_t read = pcm_read(audiobuf, f); |
| 175 | @@ -3314,7 +3314,7 @@ static void capture(char *orig_name) |
| 176 | } while ((file_type == FORMAT_RAW && !timelimit && !sampleslimit) || count > 0); |
| 177 | } |
| 178 | |
| 179 | -static void playbackv_go(int* fds, unsigned int channels, size_t loaded, off64_t count, int rtype, char **names) |
| 180 | +static void playbackv_go(int* fds, unsigned int channels, size_t loaded, off_t count, int rtype, char **names) |
| 181 | { |
| 182 | int r; |
| 183 | size_t vsize; |
| 184 | @@ -3368,7 +3368,7 @@ static void playbackv_go(int* fds, unsigned int channels, size_t loaded, off64_t |
| 185 | } |
| 186 | } |
| 187 | |
| 188 | -static void capturev_go(int* fds, unsigned int channels, off64_t count, int rtype, char **names) |
| 189 | +static void capturev_go(int* fds, unsigned int channels, off_t count, int rtype, char **names) |
| 190 | { |
| 191 | size_t c; |
| 192 | ssize_t r; |
| 193 | diff --git a/axfer/container-voc.c b/axfer/container-voc.c |
| 194 | index ec0cfff..5941003 100644 |
| 195 | --- a/axfer/container-voc.c |
| 196 | +++ b/axfer/container-voc.c |
| 197 | @@ -775,7 +775,7 @@ static int write_block_terminator(struct container_context *cntr) |
| 198 | static int write_data_size(struct container_context *cntr, uint64_t byte_count) |
| 199 | { |
| 200 | struct builder_state *state = cntr->private_data; |
| 201 | - off64_t offset; |
| 202 | + off_t offset; |
| 203 | uint8_t size_field[3]; |
| 204 | int err; |
| 205 | |
| 206 | diff --git a/axfer/container.c b/axfer/container.c |
| 207 | index 8c88d5c..379b72f 100644 |
| 208 | --- a/axfer/container.c |
| 209 | +++ b/axfer/container.c |
| 210 | @@ -113,11 +113,11 @@ enum container_format container_format_from_path(const char *path) |
| 211 | return CONTAINER_FORMAT_RAW; |
| 212 | } |
| 213 | |
| 214 | -int container_seek_offset(struct container_context *cntr, off64_t offset) |
| 215 | +int container_seek_offset(struct container_context *cntr, off_t offset) |
| 216 | { |
| 217 | - off64_t pos; |
| 218 | + off_t pos; |
| 219 | |
| 220 | - pos = lseek64(cntr->fd, offset, SEEK_SET); |
| 221 | + pos = lseek(cntr->fd, offset, SEEK_SET); |
| 222 | if (pos < 0) |
| 223 | return -errno; |
| 224 | if (pos != offset) |
| 225 | diff --git a/axfer/container.h b/axfer/container.h |
| 226 | index 71017a6..f6ce689 100644 |
| 227 | --- a/axfer/container.h |
| 228 | +++ b/axfer/container.h |
| 229 | @@ -107,7 +107,7 @@ int container_recursive_read(struct container_context *cntr, void *buf, |
| 230 | unsigned int byte_count); |
| 231 | int container_recursive_write(struct container_context *cntr, void *buf, |
| 232 | unsigned int byte_count); |
| 233 | -int container_seek_offset(struct container_context *cntr, off64_t offset); |
| 234 | +int container_seek_offset(struct container_context *cntr, off_t offset); |
| 235 | |
| 236 | extern const struct container_parser container_parser_riff_wave; |
| 237 | extern const struct container_builder container_builder_riff_wave; |
| 238 | diff --git a/axfer/test/container-test.c b/axfer/test/container-test.c |
| 239 | index e5b62dd..45b6c6a 100644 |
| 240 | --- a/axfer/test/container-test.c |
| 241 | +++ b/axfer/test/container-test.c |
| 242 | @@ -153,7 +153,7 @@ static int callback(struct test_generator *gen, snd_pcm_access_t access, |
| 243 | |
| 244 | for (i = 0; i < ARRAY_SIZE(entries); ++i) { |
| 245 | int fd; |
| 246 | - off64_t pos; |
| 247 | + off_t pos; |
| 248 | |
| 249 | frames_per_second = entries[i]; |
| 250 | |
| 251 | @@ -172,7 +172,7 @@ static int callback(struct test_generator *gen, snd_pcm_access_t access, |
| 252 | frames_per_second, frame_buffer, frame_count, |
| 253 | trial->verbose); |
| 254 | |
| 255 | - pos = lseek64(fd, 0, SEEK_SET); |
| 256 | + pos = lseek(fd, 0, SEEK_SET); |
| 257 | if (pos < 0) { |
| 258 | err = -errno; |
| 259 | break; |
| 260 | diff --git a/axfer/test/mapper-test.c b/axfer/test/mapper-test.c |
| 261 | index 477871d..6a389e9 100644 |
| 262 | --- a/axfer/test/mapper-test.c |
| 263 | +++ b/axfer/test/mapper-test.c |
| 264 | @@ -257,7 +257,7 @@ static int test_mapper(struct mapper_trial *trial, snd_pcm_access_t access, |
| 265 | goto end; |
| 266 | |
| 267 | for (i = 0; i < cntr_count; ++i) { |
| 268 | - off64_t pos = lseek64(cntr_fds[i], 0, SEEK_SET); |
| 269 | + off_t pos = lseek(cntr_fds[i], 0, SEEK_SET); |
| 270 | if (pos != 0) { |
| 271 | err = -EIO; |
| 272 | goto end; |