1 files changed, 134 insertions, 0 deletions

diff --git a/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch b/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
new file mode 100644
index 0000000000..ce64040d5f
--- /dev/null
+++ b/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
@@ -0,0 +1,134 @@
+Act as the "mv" command when rotate log
+
+Act as the "mv" command when rotate log, first rename, if failed, then
+read and write.
+
+Upstream-Status: Submitted
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ logrotate.c |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
+ 1 file changed, 56 insertions(+), 9 deletions(-)
+
+diff --git a/logrotate.c b/logrotate.c
+index 174a26b..b18b629 100644
+--- a/logrotate.c
++++ b/logrotate.c
+@@ -906,6 +906,53 @@ int findNeedRotating(struct logInfo *log, int logNum, int force)
+     return 0;
+ }
+ 
++/* Act as the "mv" command, if rename failed, then read the old file and
++ * write to new file. The function which invokes the mvFile will use
++ * the strerror(errorno) to handle the error message, so we don't have
++ * to print the error message here */
++
++int mvFile (char *oldName, char *newName, struct logInfo *log, acl_type acl)
++{
++    struct stat sbprev;
++    int fd_old, fd_new, n;
++    char buf[BUFSIZ];
++
++    /* Do the rename first */
++    if (!rename(oldName, newName))
++        return 0;
++
++    /* If the errno is EXDEV, then read old file, write newfile and
++     * remove the oldfile */
++    if (errno == EXDEV) {
++        /* Open the old file to read */
++        if ((fd_old = open(oldName, O_RDONLY)) < 0)
++            return 1;
++
++        /* Create the file to write, keep the same attribute as the old file */
++        if (stat(oldName, &sbprev))
++            return 1;
++        else {
++            if ((fd_new = createOutputFile(newName,
++                O_WRONLY | O_CREAT | O_TRUNC, &sbprev, acl, 0)) < 0 )
++                return 1;
++        }
++
++        /* Read and write */
++        while ((n = read(fd_old, buf, BUFSIZ)) > 0)
++            if (write(fd_new, buf, n) != n)
++                return 1;
++
++        if ((close(fd_old) < 0) ||
++            removeLogFile(oldName, log) ||
++            (close(fd_new) < 0))
++            return 1;
++
++        return 0;
++    }
++
++    return 1;
++}
++
+ int prerotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
+                       struct logNames *rotNames)
+ {
+@@ -1268,15 +1315,15 @@ int prerotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
+                }
+ 
+            message(MESS_DEBUG,
+-                   "renaming %s to %s (rotatecount %d, logstart %d, i %d), \n",
++                   "moving %s to %s (rotatecount %d, logstart %d, i %d), \n",
+                    oldName, newName, rotateCount, logStart, i);
+ 
+-           if (!debug && rename(oldName, newName)) {
++           if (!debug && mvFile(oldName, newName, log, prev_acl)) {
+                if (errno == ENOENT) {
+                    message(MESS_DEBUG, "old log %s does not exist\n",
+                            oldName);
+                } else {
+-                   message(MESS_ERROR, "error renaming %s to %s: %s\n",
++                   message(MESS_ERROR, "error moving %s to %s: %s\n",
+                            oldName, newName, strerror(errno));
+                    hasErrors = 1;
+                }
+@@ -1408,11 +1455,11 @@ int rotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
+                        }
+                }
+ #endif /* WITH_ACL */
+-               message(MESS_DEBUG, "renaming %s to %s\n", log->files[logNum],
++        message(MESS_DEBUG, "moving %s to %s\n", log->files[logNum],
+                    rotNames->finalName);
+            if (!debug && !hasErrors &&
+-               rename(log->files[logNum], rotNames->finalName)) {
+-               message(MESS_ERROR, "failed to rename %s to %s: %s\n",
++        mvFile(log->files[logNum], rotNames->finalName, log, prev_acl)) {
++        message(MESS_ERROR, "failed to move %s to %s: %s\n",
+                        log->files[logNum], rotNames->finalName,
+                        strerror(errno));
+                        hasErrors = 1;
+@@ -1775,7 +1822,7 @@ int rotateLogSet(struct logInfo *log, int force)
+     return hasErrors;
+ }
+ 
+-static int writeState(char *stateFilename)
++static int writeState(struct logInfo *log, char *stateFilename)
+ {
+        struct logState *p;
+        FILE *f;
+@@ -1939,7 +1986,7 @@ static int writeState(char *stateFilename)
+                fclose(f);
+ 
+        if (error == 0) {
+-               if (rename(tmpFilename, stateFilename)) {
++               if (mvFile(tmpFilename, stateFilename, log, prev_acl)) {
+                        unlink(tmpFilename);
+                        error = 1;
+                        message(MESS_ERROR, "error renaming temp state file %s\n",
+@@ -2223,7 +2270,7 @@ int main(int argc, const char **argv)
+                rc |= rotateLogSet(log, force);
+ 
+        if (!debug)
+-               rc |= writeState(stateFile);
++               rc |= writeState(log, stateFile);
+ 
+        return (rc != 0);
+ }
+-- 
+1.7.10.4
+