chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Assume initial digits in a track name are a sort key even without the
[disorder]
/
lib
/
random.c
diff --git
a/lib/random.c
b/lib/random.c
index 70e19f8323e9fda0f1d098bea8d435dea53bae23..ce87abd00c3aa73e9ac876f2ad88a0e489fcc667 100644
(file)
--- a/
lib/random.c
+++ b/
lib/random.c
@@
-23,17
+23,17
@@
*
*/
*
*/
-#include <config.h>
-#include "types.h"
+#include "common.h"
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
-#include <string.h>
#include "random.h"
#include "log.h"
#include "arcfour.h"
#include "random.h"
#include "log.h"
#include "arcfour.h"
+#include "basen.h"
+#include "mem.h"
static int random_count;
static int random_fd = -1;
static int random_count;
static int random_fd = -1;
@@
-63,7
+63,7
@@
static void random__rekey(void) {
* @param ptr Where to put random bytes
* @param bytes How many random bytes to generate
*/
* @param ptr Where to put random bytes
* @param bytes How many random bytes to generate
*/
-void random_get(
uint8_t
*ptr, size_t bytes) {
+void random_get(
void
*ptr, size_t bytes) {
if(random_count == 0)
random__rekey();
/* Encrypting 0s == just returning the keystream */
if(random_count == 0)
random__rekey();
/* Encrypting 0s == just returning the keystream */
@@
-75,6
+75,16
@@
void random_get(uint8_t *ptr, size_t bytes) {
random_count -= bytes;
}
random_count -= bytes;
}
+/** @brief Return a random ID string */
+char *random_id(void) {
+ unsigned long words[2];
+ char id[128];
+
+ random_get(words, sizeof words);
+ basen(words, sizeof words / sizeof *words, id, sizeof id, 62);
+ return xstrdup(id);
+}
+
/*
Local Variables:
c-basic-offset:2
/*
Local Variables:
c-basic-offset:2