Add support for specifying permissions in cupsFileOpen.

diff --git a/CHANGES.md b/CHANGES.md
index a5a77373fa81b52bafeae40e81d36e1a223d5173..3279c7ce5231cbafab5fac5e51b7f4bf0181c083 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -24,6 +24,7 @@ Changes in CUPS v2.5b1 (TBA)
 - Added Docker support (Issue #929)
 - Added a systemd slice to the systemd services included with the scheduler
 - Added localizations for deprecated IPP attributes/options (Issue #1020)
+- Added support for specifying permissions with the `cupsFileOpen` API.
 - Updated CUPS to require TLS support - OpenSSL, GNUTLS and LibreSSL are
   supported.
 - Updated CUPS to require ZLIB.

diff --git a/cups/file.c b/cups/file.c
index c753ca61405988a0925c72b89b45dca7aa900e21..0a6dce46cea88c12d0a599048a90dccc2605ba13 100644 (file)
--- a/cups/file.c
+++ b/cups/file.c
@@ -51,7 +51,7 @@ struct _cups_file_s                   // CUPS file structure...
 
 static ssize_t cups_compress(cups_file_t *fp, const char *buf, size_t bytes);
 static ssize_t cups_fill(cups_file_t *fp);
-static int     cups_open(const char *filename, int mode);
+static int     cups_open(const char *filename, int oflag, int mode);
 static ssize_t cups_read(cups_file_t *fp, char *buf, size_t bytes);
 static ssize_t cups_write(cups_file_t *fp, const char *buf, size_t bytes);
 
@@ -909,6 +909,9 @@ cupsFileNumber(cups_file_t *fp)             // I - CUPS file
 // supplied which enables Flate compression of the file.  Compression is
 // not supported for the "a" (append) mode.
 //
+// When opening for writing ("w") or append ("a"), an optional 'm###' suffix
+// can be used to set the permissions of the opened file.
+//
 // When opening a socket connection, the filename is a string of the form
 // "address:port" or "hostname:port". The socket will make an IPv4 or IPv6
 // connection as needed, generally preferring IPv6 connections when there is
@@ -926,6 +929,8 @@ cupsFileOpen(const char *filename,  // I - Name of file
   char         hostname[1024],         // Hostname
                *portname;              // Port "name" (number or service)
   http_addrlist_t *addrlist;           // Host address list
+  int          perm = 0664;            // Permissions for write/append
+  const char   *ptr;                   // Pointer into mode string
 
 
   DEBUG_printf("cupsFileOpen(filename=\"%s\", mode=\"%s\")", filename, mode);
@@ -936,11 +941,17 @@ cupsFileOpen(const char *filename,        // I - Name of file
       (*mode == 'a' && isdigit(mode[1] & 255)))
     return (NULL);
 
+  if ((ptr = strchr(mode, 'm')) != NULL && ptr[1] >= '0' && ptr[1] <= '7')
+  {
+    // Get permissions from mode string...
+    perm = (int)strtol(mode + 1, NULL, 8);
+  }
+
   // Open the file...
   switch (*mode)
   {
     case 'a' : // Append file
-        fd = cups_open(filename, O_WRONLY | O_CREAT | O_APPEND | O_LARGEFILE | O_BINARY);
+        fd = cups_open(filename, O_WRONLY | O_CREAT | O_APPEND | O_LARGEFILE | O_BINARY, perm);
         break;
 
     case 'r' : // Read file
@@ -948,12 +959,12 @@ cupsFileOpen(const char *filename,        // I - Name of file
        break;
 
     case 'w' : // Write file
-        fd = cups_open(filename, O_WRONLY | O_LARGEFILE | O_BINARY);
+        fd = cups_open(filename, O_WRONLY | O_LARGEFILE | O_BINARY, perm);
        if (fd < 0 && errno == ENOENT)
        {
-         fd = cups_open(filename, O_WRONLY | O_CREAT | O_EXCL | O_LARGEFILE | O_BINARY);
+         fd = cups_open(filename, O_WRONLY | O_CREAT | O_EXCL | O_LARGEFILE | O_BINARY, perm);
          if (fd < 0 && errno == EEXIST)
-           fd = cups_open(filename, O_WRONLY | O_LARGEFILE | O_BINARY);
+           fd = cups_open(filename, O_WRONLY | O_LARGEFILE | O_BINARY, perm);
        }
 
        if (fd >= 0)
@@ -2181,7 +2192,8 @@ cups_fill(cups_file_t *fp)                // I - CUPS file
 
 static int                             // O - File descriptor or -1 otherwise
 cups_open(const char *filename,                // I - Filename
-         int        mode)              // I - Open mode
+          int        oflag,            // I - Open flags
+         int        mode)              // I - Open permissions
 {
   int          fd;                     // File descriptor
   struct stat  fileinfo;               // File information
@@ -2191,7 +2203,7 @@ cups_open(const char *filename,           // I - Filename
 
 
   // Open the file...
-  if ((fd = open(filename, mode, 0666)) < 0)
+  if ((fd = open(filename, oflag, mode)) < 0)
     return (-1);
 
   // Then verify that the file descriptor doesn't point to a directory or hard-linked file.