* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: David Zeuthen <davidz@redhat.com>
*/
#include <fcntl.h>
#include <errno.h>
#include <sys/types.h>
-#ifdef HAVE_UNISTD_H
+
+#include <glib/gstdio.h>
+
+#ifdef G_OS_UNIX
#include <unistd.h>
#endif
-#ifdef _WIN32
+#ifdef G_OS_WIN32
#include <io.h>
#endif
-#include <glib/gstdio.h>
-
#include "gdbusauthmechanismsha1.h"
#include "gcredentials.h"
#include "gdbuserror.h"
static void
_g_dbus_auth_mechanism_sha1_init (GDBusAuthMechanismSha1 *mechanism)
{
- mechanism->priv = _g_dbus_auth_mechanism_sha1_get_private (mechanism);
+ mechanism->priv = _g_dbus_auth_mechanism_sha1_get_instance_private (mechanism);
}
/* ---------------------------------------------------------------------------------------------------- */
struct stat statbuf;
if (stat (path, &statbuf) != 0)
{
+ int errsv = errno;
g_set_error (error,
G_IO_ERROR,
- g_io_error_from_errno (errno),
- _("Error when getting information for directory '%s': %s"),
+ g_io_error_from_errno (errsv),
+ _("Error when getting information for directory “%s”: %s"),
path,
- strerror (errno));
+ g_strerror (errsv));
g_free (path);
path = NULL;
goto out;
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
- _("Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o"),
+ _("Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o"),
path,
- statbuf.st_mode & 0777);
+ (guint) (statbuf.st_mode & 0777));
g_free (path);
path = NULL;
goto out;
#endif
#endif
}
- goto out;
+ goto out;
}
if (g_mkdir (path, 0700) != 0)
{
+ int errsv = errno;
g_set_error (error,
G_IO_ERROR,
- g_io_error_from_errno (errno),
- _("Error creating directory '%s': %s"),
+ g_io_error_from_errno (errsv),
+ _("Error creating directory “%s”: %s"),
path,
- strerror (errno));
+ g_strerror (errsv));
g_free (path);
path = NULL;
goto out;
error))
{
g_prefix_error (error,
- _("Error opening keyring '%s' for reading: "),
+ _("Error opening keyring “%s” for reading: "),
path);
goto out;
}
gchar **tokens;
gchar *endp;
gint line_id;
- guint64 line_when;
if (line[0] == '\0')
continue;
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
- _("Line %d of the keyring at '%s' with content '%s' is malformed"),
+ _("Line %d of the keyring at “%s” with content “%s” is malformed"),
n + 1,
path,
line);
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
- _("First token of line %d of the keyring at '%s' with content '%s' is malformed"),
+ _("First token of line %d of the keyring at “%s” with content “%s” is malformed"),
n + 1,
path,
line);
goto out;
}
- line_when = g_ascii_strtoll (tokens[1], &endp, 10);
- line_when = line_when; /* To avoid -Wunused-but-set-variable */
+ (void)g_ascii_strtoll (tokens[1], &endp, 10); /* do not care what the timestamp is */
if (*endp != '\0')
{
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
- _("Second token of line %d of the keyring at '%s' with content '%s' is malformed"),
+ _("Second token of line %d of the keyring at “%s” with content “%s” is malformed"),
n + 1,
path,
line);
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
- _("Didn't find cookie with id %d in the keyring at '%s'"),
+ _("Didn’t find cookie with id %d in the keyring at “%s”"),
cookie_id,
path);
gchar *lock;
gint ret;
guint num_tries;
+#ifdef EEXISTS
guint num_create_tries;
+#endif
+ int errsv;
g_return_val_if_fail (path != NULL, FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
* real locking implementations are still flaky on network filesystems
*/
- num_create_tries = 0;
#ifdef EEXISTS
+ num_create_tries = 0;
again:
#endif
num_tries = 0;
*/
if (g_unlink (lock) != 0)
{
+ errsv = errno;
g_set_error (error,
G_IO_ERROR,
- g_io_error_from_errno (errno),
- _("Error deleting stale lock file '%s': %s"),
+ g_io_error_from_errno (errsv),
+ _("Error deleting stale lock file “%s”: %s"),
lock,
- strerror (errno));
+ g_strerror (errsv));
goto out;
}
_log ("Deleted stale lock file '%s'", lock);
0,
#endif
0700);
+ errsv = errno;
if (ret == -1)
{
#ifdef EEXISTS
/* EEXIST: pathname already exists and O_CREAT and O_EXCL were used. */
- if (errno == EEXISTS)
+ if (errsv == EEXISTS)
{
num_create_tries++;
if (num_create_tries < 5)
goto again;
}
#endif
- num_create_tries = num_create_tries; /* To avoid -Wunused-but-set-variable */
g_set_error (error,
G_IO_ERROR,
- g_io_error_from_errno (errno),
- _("Error creating lock file '%s': %s"),
+ g_io_error_from_errno (errsv),
+ _("Error creating lock file “%s”: %s"),
lock,
- strerror (errno));
+ g_strerror (errsv));
goto out;
}
lock = g_strdup_printf ("%s.lock", path);
if (close (lock_fd) != 0)
{
+ int errsv = errno;
g_set_error (error,
G_IO_ERROR,
- g_io_error_from_errno (errno),
- _("Error closing (unlinked) lock file '%s': %s"),
+ g_io_error_from_errno (errsv),
+ _("Error closing (unlinked) lock file “%s”: %s"),
lock,
- strerror (errno));
+ g_strerror (errsv));
goto out;
}
if (g_unlink (lock) != 0)
{
+ int errsv = errno;
g_set_error (error,
G_IO_ERROR,
- g_io_error_from_errno (errno),
- _("Error unlinking lock file '%s': %s"),
+ g_io_error_from_errno (errsv),
+ _("Error unlinking lock file “%s”: %s"),
lock,
- strerror (errno));
+ g_strerror (errsv));
goto out;
}
{
g_propagate_prefixed_error (error,
local_error,
- _("Error opening keyring '%s' for writing: "),
+ _("Error opening keyring “%s” for writing: "),
path);
goto out;
}
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
- _("Line %d of the keyring at '%s' with content '%s' is malformed"),
+ _("Line %d of the keyring at “%s” with content “%s” is malformed"),
n + 1,
path,
line);
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
- _("First token of line %d of the keyring at '%s' with content '%s' is malformed"),
+ _("First token of line %d of the keyring at “%s” with content “%s” is malformed"),
n + 1,
path,
line);
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
- _("Second token of line %d of the keyring at '%s' with content '%s' is malformed"),
+ _("Second token of line %d of the keyring at “%s” with content “%s” is malformed"),
n + 1,
path,
line);
g_strfreev (tokens);
goto out;
}
- line_when = line_when; /* To avoid -Wunused-but-set-variable */
/* D-Bus spec says:
else
{
g_prefix_error (error,
- _("(Additionally, releasing the lock for '%s' also failed: %s) "),
+ _("(Additionally, releasing the lock for “%s” also failed: %s) "),
path,
local_error->message);
}
projects / platform / upstream / glib.git / blobdiff