[pulseaudio-commits] r1532 - /branches/lennart/src/pulsecore/authkey.c
svnmailer-noreply at 0pointer.de
svnmailer-noreply at 0pointer.de
Wed Jul 25 08:50:10 PDT 2007
Author: lennart
Date: Wed Jul 25 17:50:09 2007
New Revision: 1532
URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1532&root=3Dpulseaudio&vi=
ew=3Drev
Log:
Modernize things a little
Modified:
branches/lennart/src/pulsecore/authkey.c
Modified: branches/lennart/src/pulsecore/authkey.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/=
authkey.c?rev=3D1532&root=3Dpulseaudio&r1=3D1531&r2=3D1532&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/pulsecore/authkey.c (original)
+++ branches/lennart/src/pulsecore/authkey.c Wed Jul 25 17:50:09 2007
@@ -26,7 +26,6 @@
#include <config.h>
#endif
=
-#include <assert.h>
#include <unistd.h>
#include <fcntl.h>
#include <string.h>
@@ -43,13 +42,17 @@
#include <pulsecore/core-util.h>
#include <pulsecore/log.h>
#include <pulsecore/random.h>
+#include <pulsecore/macro.h>
=
#include "authkey.h"
=
/* Generate a new authorization key, store it in file fd and return it in =
*data */
static int generate(int fd, void *ret_data, size_t length) {
ssize_t r;
- assert(fd >=3D 0 && ret_data && length);
+ =
+ pa_assert(fd >=3D 0);
+ pa_assert(ret_data);
+ pa_assert(length > 0);
=
pa_random(ret_data, length);
=
@@ -57,7 +60,7 @@
ftruncate(fd, 0);
=
if ((r =3D pa_loop_write(fd, ret_data, length, NULL)) < 0 || (size_t) =
r !=3D length) {
- pa_log("failed to write cookie file: %s", pa_cstrerror(errno));
+ pa_log("Failed to write cookie file: %s", pa_cstrerror(errno));
return -1;
}
=
@@ -75,11 +78,15 @@
int writable =3D 1;
int unlock =3D 0, ret =3D -1;
ssize_t r;
- assert(fn && data && length);
-
- if ((fd =3D open(fn, O_RDWR|O_CREAT|O_BINARY, S_IRUSR|S_IWUSR)) < 0) {
- if (errno !=3D EACCES || (fd =3D open(fn, O_RDONLY|O_BINARY)) < 0)=
{
- pa_log("failed to open cookie file '%s': %s", fn, pa_cstrerror=
(errno));
+ =
+ pa_assert(fn);
+ pa_assert(data);
+ pa_assert(length > 0);
+
+ if ((fd =3D open(fn, O_RDWR|O_CREAT|O_BINARY|O_NOCTTY, S_IRUSR|S_IWUSR=
)) < 0) {
+ =
+ if (errno !=3D EACCES || (fd =3D open(fn, O_RDONLY|O_BINARY|O_NOCT=
TY)) < 0) {
+ pa_log("Failed to open cookie file '%s': %s", fn, pa_cstrerror=
(errno));
goto finish;
} else
writable =3D 0;
@@ -88,15 +95,15 @@
unlock =3D pa_lock_fd(fd, 1) >=3D 0;
=
if ((r =3D pa_loop_read(fd, data, length, NULL)) < 0) {
- pa_log("failed to read cookie file '%s': %s", fn, pa_cstrerror(err=
no));
+ pa_log("Failed to read cookie file '%s': %s", fn, pa_cstrerror(err=
no));
goto finish;
}
=
if ((size_t) r !=3D length) {
- pa_log_debug("got %d bytes from cookie file '%s', expected %d", (i=
nt)r, fn, (int)length);
+ pa_log_debug("Got %d bytes from cookie file '%s', expected %d", (i=
nt) r, fn, (int) length);
=
if (!writable) {
- pa_log("unable to write cookie to read only file");
+ pa_log("Unable to write cookie to read only file");
goto finish;
}
=
@@ -123,13 +130,12 @@
int pa_authkey_load(const char *path, void *data, size_t length) {
int ret;
=
- assert(path && data && length);
-
- ret =3D load(path, data, length);
-
- if (ret < 0)
- pa_log("Failed to load authorization key '%s': %s", path,
- (ret =3D=3D -1) ? pa_cstrerror(errno) : "file corrupt");
+ pa_assert(path);
+ pa_assert(data);
+ pa_assert(length > 0);
+
+ if ((ret =3D load(path, data, length)) < 0)
+ pa_log("Failed to load authorization key '%s': %s", path, (ret < 0=
) ? pa_cstrerror(errno) : "File corrupt");
=
return ret;
}
@@ -137,7 +143,10 @@
/* If the specified file path starts with / return it, otherwise
* return path prepended with home directory */
static const char *normalize_path(const char *fn, char *s, size_t l) {
- assert(fn && s && l > 0);
+
+ pa_assert(fn);
+ pa_assert(s);
+ pa_assert(l > 0);
=
#ifndef OS_IS_WIN32
if (fn[0] !=3D '/') {
@@ -145,13 +154,14 @@
if (strlen(fn) < 3 || !isalpha(fn[0]) || fn[1] !=3D ':' || fn[2] !=3D =
'\\') {
#endif
char homedir[PATH_MAX];
+ =
if (!pa_get_home_dir(homedir, sizeof(homedir)))
return NULL;
=
#ifndef OS_IS_WIN32
- snprintf(s, l, "%s/%s", homedir, fn);
+ pa_snprintf(s, l, "%s/%s", homedir, fn);
#else
- snprintf(s, l, "%s\\%s", homedir, fn);
+ pa_snprintf(s, l, "%s\\%s", homedir, fn);
#endif
return s;
}
@@ -164,7 +174,10 @@
int pa_authkey_load_auto(const char *fn, void *data, size_t length) {
char path[PATH_MAX];
const char *p;
- assert(fn && data && length);
+ =
+ pa_assert(fn);
+ pa_assert(data);
+ pa_assert(length > 0);
=
if (!(p =3D normalize_path(fn, path, sizeof(path))))
return -2;
@@ -179,20 +192,23 @@
ssize_t r;
char path[PATH_MAX];
const char *p;
- assert(fn && data && length);
+ =
+ pa_assert(fn);
+ pa_assert(data);
+ pa_assert(length > 0);
=
if (!(p =3D normalize_path(fn, path, sizeof(path))))
return -2;
=
- if ((fd =3D open(p, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR)) < 0) {
- pa_log("failed to open cookie file '%s': %s", fn, pa_cstrerror(err=
no));
+ if ((fd =3D open(p, O_RDWR|O_CREAT|O_NOCTTY, S_IRUSR|S_IWUSR)) < 0) {
+ pa_log("Failed to open cookie file '%s': %s", fn, pa_cstrerror(err=
no));
goto finish;
}
=
unlock =3D pa_lock_fd(fd, 1) >=3D 0;
=
if ((r =3D pa_loop_write(fd, data, length, NULL)) < 0 || (size_t) r !=
=3D length) {
- pa_log("failed to read cookie file '%s': %s", fn, pa_cstrerror(err=
no));
+ pa_log("Failed to read cookie file '%s': %s", fn, pa_cstrerror(err=
no));
goto finish;
}
=
More information about the pulseaudio-commits
mailing list