mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-05-30 01:02:29 +00:00
Remove old shuffle header
This commit is contained in:
parent
c7e3d9f7ff
commit
a51ccc8fb1
5 changed files with 64 additions and 32 deletions
|
@ -44,9 +44,8 @@ ssize_t getdelim_unlocked(char **s, size_t *n, int delim, FILE *f) {
|
|||
*n = 0;
|
||||
for (i = 0;; i += m) {
|
||||
m = f->end - f->beg;
|
||||
if ((p = memchr(f->buf + f->beg, delim, m))) {
|
||||
if ((p = memchr(f->buf + f->beg, delim, m)))
|
||||
m = p + 1 - (f->buf + f->beg);
|
||||
}
|
||||
if (i + m + 1 > *n) {
|
||||
n2 = i + m + 1;
|
||||
s2 = realloc(*s, n2);
|
||||
|
@ -59,10 +58,9 @@ ssize_t getdelim_unlocked(char **s, size_t *n, int delim, FILE *f) {
|
|||
}
|
||||
}
|
||||
memcpy(*s + i, f->buf + f->beg, m);
|
||||
(*s)[i + m] = '\0';
|
||||
if ((f->beg += m) == f->end) {
|
||||
(*s)[i + m] = 0;
|
||||
if ((f->beg += m) == f->end)
|
||||
f->beg = f->end = 0;
|
||||
}
|
||||
if (p) {
|
||||
return i + m;
|
||||
} else if (f->fd == -1) {
|
||||
|
@ -71,7 +69,7 @@ ssize_t getdelim_unlocked(char **s, size_t *n, int delim, FILE *f) {
|
|||
if (!rc)
|
||||
break;
|
||||
f->end = rc;
|
||||
} else if (errno != EINTR) {
|
||||
} else {
|
||||
f->state = errno;
|
||||
return -1;
|
||||
}
|
||||
|
|
|
@ -16,14 +16,23 @@
|
|||
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
|
||||
│ PERFORMANCE OF THIS SOFTWARE. │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/mem/shuffle.internal.h"
|
||||
#include "libc/stdio/rand.h"
|
||||
#include "libc/str/str.h"
|
||||
|
||||
/**
|
||||
* Jumbles up string.
|
||||
* Performs Fisher-Yates shuffle on string in-place to create anagram.
|
||||
*
|
||||
* This implementation uses rand() so `srand(time(0))` may be desired.
|
||||
*/
|
||||
char *strfry(char *s) {
|
||||
shuffle(rand, s, strlen(s));
|
||||
size_t i = strlen(s);
|
||||
while (i > 1) {
|
||||
size_t x = rand();
|
||||
size_t y = rand();
|
||||
size_t j = ((x << 31) ^ y) % i--;
|
||||
char t = s[j];
|
||||
s[j] = s[i];
|
||||
s[i] = t;
|
||||
}
|
||||
return s;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue