[libav-devel] [PATCH] lavu: Add av_rename

[Luca Barbato]

And replace the rename() usages while at it.
---
It is missing the APIChange since I'm too tired now, updating the
patch adding it would be much appreciated, if everybody likes it.


 libavformat/hdsenc.c             | 11 ++++++-----
 libavformat/smoothstreamingenc.c |  7 ++++---
 libavutil/file.h                 |  7 +++++++
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/libavformat/hdsenc.c b/libavformat/hdsenc.c
index 53fef33..316f3ff 100644
--- a/libavformat/hdsenc.c
+++ b/libavformat/hdsenc.c
@@ -31,6 +31,7 @@

 #include "libavutil/avstring.h"
 #include "libavutil/base64.h"
+#include "libavutil/file.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
@@ -204,8 +205,7 @@ static int write_manifest(AVFormatContext *s, int final)
     avio_printf(out, "</manifest>\n");
     avio_flush(out);
     avio_close(out);
-    rename(temp_filename, filename);
-    return 0;
+    return av_rename(temp_filename, filename);
 }

 static void update_size(AVIOContext *out, int64_t pos)
@@ -286,8 +286,7 @@ static int write_abst(AVFormatContext *s, OutputStream *os, 
int final)
     update_size(out, afrt_pos);
     update_size(out, 0);
     avio_close(out);
-    rename(temp_filename, filename);
-    return 0;
+    return av_rename(temp_filename, filename);
 }

 static int init_file(AVFormatContext *s, OutputStream *os, int64_t start_ts)
@@ -481,7 +480,9 @@ static int hds_flush(AVFormatContext *s, OutputStream *os, 
int final,

     snprintf(target_filename, sizeof(target_filename),
              "%s/stream%dSeg1-Frag%d", s->filename, index, os->fragment_index);
-    rename(os->temp_filename, target_filename);
+    ret = av_rename(os->temp_filename, target_filename);
+    if (ret < 0)
+        return ret;
     add_fragment(os, target_filename, os->frag_start_ts, end_ts - 
os->frag_start_ts);

     if (!final) {
diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c
index a6d0a36..c5d1c87 100644
--- a/libavformat/smoothstreamingenc.c
+++ b/libavformat/smoothstreamingenc.c
@@ -34,6 +34,7 @@

 #include "libavutil/opt.h"
 #include "libavutil/avstring.h"
+#include "libavutil/file.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/intreadwrite.h"

@@ -282,8 +283,7 @@ static int write_manifest(AVFormatContext *s, int final)
     avio_printf(out, "</SmoothStreamingMedia>\n");
     avio_flush(out);
     avio_close(out);
-    rename(temp_filename, filename);
-    return 0;
+    return av_rename(temp_filename, filename);
 }

 static int ism_write_header(AVFormatContext *s)
@@ -540,7 +540,8 @@ static int ism_flush(AVFormatContext *s, int final)
         snprintf(header_filename, sizeof(header_filename), 
"%s/FragmentInfo(%s=%"PRIu64")", os->dirname, os->stream_type_tag, start_ts);
         snprintf(target_filename, sizeof(target_filename), 
"%s/Fragments(%s=%"PRIu64")", os->dirname, os->stream_type_tag, start_ts);
         copy_moof(s, filename, header_filename, moof_size);
-        rename(filename, target_filename);
+        if (ret = av_rename(filename, target_filename) < 0)
+            break;
         add_fragment(os, target_filename, header_filename, start_ts, duration,
                      os->cur_start_pos, size);
     }
diff --git a/libavutil/file.h b/libavutil/file.h
index e3f02a8..ef85295 100644
--- a/libavutil/file.h
+++ b/libavutil/file.h
@@ -51,4 +51,11 @@ int av_file_map(const char *filename, uint8_t **bufptr, 
size_t *size,
  */
 void av_file_unmap(uint8_t *bufptr, size_t size);

+static inline int av_rename(const char *oldpath, const char *newpath)
+{
+    if (rename(oldpath, newpath) == -1)
+        return AVERROR(errno);
+    return 0;
+}
+
 #endif /* AVUTIL_FILE_H */
--
2.1.0

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel