Commit ce4cc316 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'mdroth/qga-pull-2013-05-13' into staging 



* mdroth/qga-pull-2013-05-13:
  qga: unlink just created guest-file if fchmod() or fdopen() fails on it
  qga: distinguish binary modes in "guest_file_open_modes" map

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 77417f10 2b720018

qga/commands-posix.c

+19 −6
Original line number Diff line number Diff line
@@ -242,17 +242,27 @@ static GuestFileHandle *guest_file_handle_find(int64_t id, Error **err) 


typedef const char * const ccpc;



#ifndef O_BINARY

#define O_BINARY 0

#endif



/* http://pubs.opengroup.org/onlinepubs/9699919799/functions/fopen.html */

static const struct {

    ccpc *forms;

    int oflag_base;

} guest_file_open_modes[] = {

    { (ccpc[]){ "r",  "rb",         NULL }, O_RDONLY                      },

    { (ccpc[]){ "w",  "wb",         NULL }, O_WRONLY | O_CREAT | O_TRUNC  },

    { (ccpc[]){ "a",  "ab",         NULL }, O_WRONLY | O_CREAT | O_APPEND },

    { (ccpc[]){ "r+", "rb+", "r+b", NULL }, O_RDWR                        },

    { (ccpc[]){ "w+", "wb+", "w+b", NULL }, O_RDWR   | O_CREAT | O_TRUNC  },

    { (ccpc[]){ "a+", "ab+", "a+b", NULL }, O_RDWR   | O_CREAT | O_APPEND }

    { (ccpc[]){ "r",          NULL }, O_RDONLY                                 },

    { (ccpc[]){ "rb",         NULL }, O_RDONLY                      | O_BINARY },

    { (ccpc[]){ "w",          NULL }, O_WRONLY | O_CREAT | O_TRUNC             },

    { (ccpc[]){ "wb",         NULL }, O_WRONLY | O_CREAT | O_TRUNC  | O_BINARY },

    { (ccpc[]){ "a",          NULL }, O_WRONLY | O_CREAT | O_APPEND            },

    { (ccpc[]){ "ab",         NULL }, O_WRONLY | O_CREAT | O_APPEND | O_BINARY },

    { (ccpc[]){ "r+",         NULL }, O_RDWR                                   },

    { (ccpc[]){ "rb+", "r+b", NULL }, O_RDWR                        | O_BINARY },

    { (ccpc[]){ "w+",         NULL }, O_RDWR   | O_CREAT | O_TRUNC             },

    { (ccpc[]){ "wb+", "w+b", NULL }, O_RDWR   | O_CREAT | O_TRUNC  | O_BINARY },

    { (ccpc[]){ "a+",         NULL }, O_RDWR   | O_CREAT | O_APPEND            },

    { (ccpc[]){ "ab+", "a+b", NULL }, O_RDWR   | O_CREAT | O_APPEND | O_BINARY }

};



static int
@@ -345,6 +355,9 @@ safe_open_or_create(const char *path, const char *mode, Error **err) 
            }



            close(fd);

            if (oflag & O_CREAT) {

                unlink(path);

            }

        }

    }