ClangFormat: apply to source, most of intern

Apply clang format as proposed in T53211.

For details on usage and instructions for migrating branches
without conflicts, see:

https://wiki.blender.org/wiki/Tools/ClangFormat

1 files changed, 573 insertions, 554 deletions

diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c
index a039e0544d5..a1b315be19a 100644
--- a/source/blender/blenkernel/intern/packedFile.c
+++ b/source/blender/blenkernel/intern/packedFile.c
@@ -21,15 +21,14 @@
  * \ingroup bke
  */
 
-
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 
 #ifndef WIN32
-#include <unistd.h>
+#  include <unistd.h>
 #else
-#include <io.h>
+#  include <io.h>
 #endif
 #include <string.h>
 #include "MEM_guardedalloc.h"
@@ -52,272 +51,284 @@
 
 int seekPackedFile(PackedFile *pf, int offset, int whence)
 {
-	int oldseek = -1, seek = 0;
-
-	if (pf) {
-		oldseek = pf->seek;
-		switch (whence) {
-			case SEEK_CUR:
-				seek = oldseek + offset;
-				break;
-			case SEEK_END:
-				seek = pf->size + offset;
-				break;
-			case SEEK_SET:
-				seek = offset;
-				break;
-			default:
-				oldseek = -1;
-				break;
-		}
-		if (seek < 0) {
-			seek = 0;
-		}
-		else if (seek > pf->size) {
-			seek = pf->size;
-		}
-		pf->seek = seek;
-	}
-
-	return(oldseek);
+  int oldseek = -1, seek = 0;
+
+  if (pf) {
+    oldseek = pf->seek;
+    switch (whence) {
+      case SEEK_CUR:
+        seek = oldseek + offset;
+        break;
+      case SEEK_END:
+        seek = pf->size + offset;
+        break;
+      case SEEK_SET:
+        seek = offset;
+        break;
+      default:
+        oldseek = -1;
+        break;
+    }
+    if (seek < 0) {
+      seek = 0;
+    }
+    else if (seek > pf->size) {
+      seek = pf->size;
+    }
+    pf->seek = seek;
+  }
+
+  return (oldseek);
 }
 
 void rewindPackedFile(PackedFile *pf)
 {
-	seekPackedFile(pf, 0, SEEK_SET);
+  seekPackedFile(pf, 0, SEEK_SET);
 }
 
 int readPackedFile(PackedFile *pf, void *data, int size)
 {
-	if ((pf != NULL) && (size >= 0) && (data != NULL)) {
-		if (size + pf->seek > pf->size) {
-			size = pf->size - pf->seek;
-		}
-
-		if (size > 0) {
-			memcpy(data, ((char *) pf->data) + pf->seek, size);
-		}
-		else {
-			size = 0;
-		}
-
-		pf->seek += size;
-	}
-	else {
-		size = -1;
-	}
-
-	return(size);
+  if ((pf != NULL) && (size >= 0) && (data != NULL)) {
+    if (size + pf->seek > pf->size) {
+      size = pf->size - pf->seek;
+    }
+
+    if (size > 0) {
+      memcpy(data, ((char *)pf->data) + pf->seek, size);
+    }
+    else {
+      size = 0;
+    }
+
+    pf->seek += size;
+  }
+  else {
+    size = -1;
+  }
+
+  return (size);
 }
 
 int countPackedFiles(Main *bmain)
 {
-	Image *ima;
-	VFont *vf;
-	bSound *sound;
-	int count = 0;
+  Image *ima;
+  VFont *vf;
+  bSound *sound;
+  int count = 0;
 
-	/* let's check if there are packed files... */
-	for (ima = bmain->images.first; ima; ima = ima->id.next)
-		if (BKE_image_has_packedfile(ima))
-			count ++;
+  /* let's check if there are packed files... */
+  for (ima = bmain->images.first; ima; ima = ima->id.next)
+    if (BKE_image_has_packedfile(ima))
+      count++;
 
-	for (vf = bmain->fonts.first; vf; vf = vf->id.next)
-		if (vf->packedfile)
-			count++;
+  for (vf = bmain->fonts.first; vf; vf = vf->id.next)
+    if (vf->packedfile)
+      count++;
 
-	for (sound = bmain->sounds.first; sound; sound = sound->id.next)
-		if (sound->packedfile)
-			count++;
+  for (sound = bmain->sounds.first; sound; sound = sound->id.next)
+    if (sound->packedfile)
+      count++;
 
-	return count;
+  return count;
 }
 
 void freePackedFile(PackedFile *pf)
 {
-	if (pf) {
-		MEM_freeN(pf->data);
-		MEM_freeN(pf);
-	}
-	else
-		printf("freePackedFile: Trying to free a NULL pointer\n");
+  if (pf) {
+    MEM_freeN(pf->data);
+    MEM_freeN(pf);
+  }
+  else
+    printf("freePackedFile: Trying to free a NULL pointer\n");
 }
 
 PackedFile *dupPackedFile(const PackedFile *pf_src)
 {
-	PackedFile *pf_dst;
+  PackedFile *pf_dst;
 
-	pf_dst       = MEM_dupallocN(pf_src);
-	pf_dst->data = MEM_dupallocN(pf_src->data);
+  pf_dst = MEM_dupallocN(pf_src);
+  pf_dst->data = MEM_dupallocN(pf_src->data);
 
-	return pf_dst;
+  return pf_dst;
 }
 
 PackedFile *newPackedFileMemory(void *mem, int memlen)
 {
-	PackedFile *pf = MEM_callocN(sizeof(*pf), "PackedFile");
-	pf->data = mem;
-	pf->size = memlen;
+  PackedFile *pf = MEM_callocN(sizeof(*pf), "PackedFile");
+  pf->data = mem;
+  pf->size = memlen;
 
-	return pf;
+  return pf;
 }
 
 PackedFile *newPackedFile(ReportList *reports, const char *filename, const char *basepath)
 {
-	PackedFile *pf = NULL;
-	int file, filelen;
-	char name[FILE_MAX];
-	void *data;
-
-	/* render result has no filename and can be ignored
-	 * any other files with no name can be ignored too */
-	if (filename[0] == '\0')
-		return NULL;
-
-	//XXX waitcursor(1);
-
-	/* convert relative filenames to absolute filenames */
-
-	BLI_strncpy(name, filename, sizeof(name));
-	BLI_path_abs(name, basepath);
-
-	/* open the file
-	 * and create a PackedFile structure */
-
-	file = BLI_open(name, O_BINARY | O_RDONLY, 0);
-	if (file == -1) {
-		BKE_reportf(reports, RPT_ERROR, "Unable to pack file, source path '%s' not found", name);
-	}
-	else {
-		filelen = BLI_file_descriptor_size(file);
-
-		if (filelen == 0) {
-			/* MEM_mallocN complains about MEM_mallocN(0, "bla");
-			 * we don't care.... */
-			data = MEM_mallocN(1, "packFile");
-		}
-		else {
-			data = MEM_mallocN(filelen, "packFile");
-		}
-		if (read(file, data, filelen) == filelen) {
-			pf = newPackedFileMemory(data, filelen);
-		}
-		else {
-			MEM_freeN(data);
-		}
-
-		close(file);
-	}
-
-	//XXX waitcursor(0);
-
-	return (pf);
+  PackedFile *pf = NULL;
+  int file, filelen;
+  char name[FILE_MAX];
+  void *data;
+
+  /* render result has no filename and can be ignored
+   * any other files with no name can be ignored too */
+  if (filename[0] == '\0')
+    return NULL;
+
+  //XXX waitcursor(1);
+
+  /* convert relative filenames to absolute filenames */
+
+  BLI_strncpy(name, filename, sizeof(name));
+  BLI_path_abs(name, basepath);
+
+  /* open the file
+   * and create a PackedFile structure */
+
+  file = BLI_open(name, O_BINARY | O_RDONLY, 0);
+  if (file == -1) {
+    BKE_reportf(reports, RPT_ERROR, "Unable to pack file, source path '%s' not found", name);
+  }
+  else {
+    filelen = BLI_file_descriptor_size(file);
+
+    if (filelen == 0) {
+      /* MEM_mallocN complains about MEM_mallocN(0, "bla");
+       * we don't care.... */
+      data = MEM_mallocN(1, "packFile");
+    }
+    else {
+      data = MEM_mallocN(filelen, "packFile");
+    }
+    if (read(file, data, filelen) == filelen) {
+      pf = newPackedFileMemory(data, filelen);
+    }
+    else {
+      MEM_freeN(data);
+    }
+
+    close(file);
+  }
+
+  //XXX waitcursor(0);
+
+  return (pf);
 }
 
 /* no libraries for now */
 void packAll(Main *bmain, ReportList *reports, bool verbose)
 {
-	Image *ima;
-	VFont *vfont;
-	bSound *sound;
-	int tot = 0;
-
-	for (ima = bmain->images.first; ima; ima = ima->id.next) {
-		if (BKE_image_has_packedfile(ima) == false && !ID_IS_LINKED(ima)) {
-			if (ima->source == IMA_SRC_FILE) {
-				BKE_image_packfiles(reports, ima, ID_BLEND_PATH(bmain, &ima->id));
-				tot ++;
-			}
-			else if (BKE_image_is_animated(ima) && verbose) {
-				BKE_reportf(reports, RPT_WARNING, "Image '%s' skipped, movies and image sequences not supported",
-				            ima->id.name + 2);
-			}
-		}
-	}
-
-	for (vfont = bmain->fonts.first; vfont; vfont = vfont->id.next) {
-		if (vfont->packedfile == NULL && !ID_IS_LINKED(vfont) && BKE_vfont_is_builtin(vfont) == false) {
-			vfont->packedfile = newPackedFile(reports, vfont->name, BKE_main_blendfile_path(bmain));
-			tot ++;
-		}
-	}
-
-	for (sound = bmain->sounds.first; sound; sound = sound->id.next) {
-		if (sound->packedfile == NULL && !ID_IS_LINKED(sound)) {
-			sound->packedfile = newPackedFile(reports, sound->name, BKE_main_blendfile_path(bmain));
-			tot++;
-		}
-	}
-
-	if (tot > 0)
-		BKE_reportf(reports, RPT_INFO, "Packed %d files", tot);
-	else if (verbose)
-		BKE_report(reports, RPT_INFO, "No new files have been packed");
+  Image *ima;
+  VFont *vfont;
+  bSound *sound;
+  int tot = 0;
+
+  for (ima = bmain->images.first; ima; ima = ima->id.next) {
+    if (BKE_image_has_packedfile(ima) == false && !ID_IS_LINKED(ima)) {
+      if (ima->source == IMA_SRC_FILE) {
+        BKE_image_packfiles(reports, ima, ID_BLEND_PATH(bmain, &ima->id));
+        tot++;
+      }
+      else if (BKE_image_is_animated(ima) && verbose) {
+        BKE_reportf(reports,
+                    RPT_WARNING,
+                    "Image '%s' skipped, movies and image sequences not supported",
+                    ima->id.name + 2);
+      }
+    }
+  }
+
+  for (vfont = bmain->fonts.first; vfont; vfont = vfont->id.next) {
+    if (vfont->packedfile == NULL && !ID_IS_LINKED(vfont) &&
+        BKE_vfont_is_builtin(vfont) == false) {
+      vfont->packedfile = newPackedFile(reports, vfont->name, BKE_main_blendfile_path(bmain));
+      tot++;
+    }
+  }
+
+  for (sound = bmain->sounds.first; sound; sound = sound->id.next) {
+    if (sound->packedfile == NULL && !ID_IS_LINKED(sound)) {
+      sound->packedfile = newPackedFile(reports, sound->name, BKE_main_blendfile_path(bmain));
+      tot++;
+    }
+  }
+
+  if (tot > 0)
+    BKE_reportf(reports, RPT_INFO, "Packed %d files", tot);
+  else if (verbose)
+    BKE_report(reports, RPT_INFO, "No new files have been packed");
 }
 
-int writePackedFile(
-        ReportList *reports, const char *ref_file_name, const char *filename, PackedFile *pf, const bool guimode)
+int writePackedFile(ReportList *reports,
+                    const char *ref_file_name,
+                    const char *filename,
+                    PackedFile *pf,
+                    const bool guimode)
 {
-	int file, number;
-	int ret_value = RET_OK;
-	bool remove_tmp = false;
-	char name[FILE_MAX];
-	char tempname[FILE_MAX];
-/*      void *data; */
-
-	if (guimode) {} //XXX  waitcursor(1);
-
-	BLI_strncpy(name, filename, sizeof(name));
-	BLI_path_abs(name, ref_file_name);
-
-	if (BLI_exists(name)) {
-		for (number = 1; number <= 999; number++) {
-			BLI_snprintf(tempname, sizeof(tempname), "%s.%03d_", name, number);
-			if (!BLI_exists(tempname)) {
-				if (BLI_copy(name, tempname) == RET_OK) {
-					remove_tmp = true;
-				}
-				break;
-			}
-		}
-	}
-
-	/* make sure the path to the file exists... */
-	BLI_make_existing_file(name);
-
-	file = BLI_open(name, O_BINARY + O_WRONLY + O_CREAT + O_TRUNC, 0666);
-	if (file == -1) {
-		BKE_reportf(reports, RPT_ERROR, "Error creating file '%s'", name);
-		ret_value = RET_ERROR;
-	}
-	else {
-		if (write(file, pf->data, pf->size) != pf->size) {
-			BKE_reportf(reports, RPT_ERROR, "Error writing file '%s'", name);
-			ret_value = RET_ERROR;
-		}
-		else {
-			BKE_reportf(reports, RPT_INFO, "Saved packed file to: %s", name);
-		}
-
-		close(file);
-	}
-
-	if (remove_tmp) {
-		if (ret_value == RET_ERROR) {
-			if (BLI_rename(tempname, name) != 0) {
-				BKE_reportf(reports, RPT_ERROR, "Error restoring temp file (check files '%s' '%s')", tempname, name);
-			}
-		}
-		else {
-			if (BLI_delete(tempname, false, false) != 0) {
-				BKE_reportf(reports, RPT_ERROR, "Error deleting '%s' (ignored)", tempname);
-			}
-		}
-	}
-
-	if (guimode) {} //XXX waitcursor(0);
-
-	return (ret_value);
+  int file, number;
+  int ret_value = RET_OK;
+  bool remove_tmp = false;
+  char name[FILE_MAX];
+  char tempname[FILE_MAX];
+  /*      void *data; */
+
+  if (guimode) {
+  }  //XXX  waitcursor(1);
+
+  BLI_strncpy(name, filename, sizeof(name));
+  BLI_path_abs(name, ref_file_name);
+
+  if (BLI_exists(name)) {
+    for (number = 1; number <= 999; number++) {
+      BLI_snprintf(tempname, sizeof(tempname), "%s.%03d_", name, number);
+      if (!BLI_exists(tempname)) {
+        if (BLI_copy(name, tempname) == RET_OK) {
+          remove_tmp = true;
+        }
+        break;
+      }
+    }
+  }
+
+  /* make sure the path to the file exists... */
+  BLI_make_existing_file(name);
+
+  file = BLI_open(name, O_BINARY + O_WRONLY + O_CREAT + O_TRUNC, 0666);
+  if (file == -1) {
+    BKE_reportf(reports, RPT_ERROR, "Error creating file '%s'", name);
+    ret_value = RET_ERROR;
+  }
+  else {
+    if (write(file, pf->data, pf->size) != pf->size) {
+      BKE_reportf(reports, RPT_ERROR, "Error writing file '%s'", name);
+      ret_value = RET_ERROR;
+    }
+    else {
+      BKE_reportf(reports, RPT_INFO, "Saved packed file to: %s", name);
+    }
+
+    close(file);
+  }
+
+  if (remove_tmp) {
+    if (ret_value == RET_ERROR) {
+      if (BLI_rename(tempname, name) != 0) {
+        BKE_reportf(reports,
+                    RPT_ERROR,
+                    "Error restoring temp file (check files '%s' '%s')",
+                    tempname,
+                    name);
+      }
+    }
+    else {
+      if (BLI_delete(tempname, false, false) != 0) {
+        BKE_reportf(reports, RPT_ERROR, "Error deleting '%s' (ignored)", tempname);
+      }
+    }
+  }
+
+  if (guimode) {
+  }  //XXX waitcursor(0);
+
+  return (ret_value);
 }
 
 /**
@@ -330,54 +341,54 @@ int writePackedFile(
  */
 int checkPackedFile(const char *ref_file_name, const char *filename, PackedFile *pf)
 {
-	BLI_stat_t st;
-	int ret_val, i, len, file;
-	char buf[4096];
-	char name[FILE_MAX];
-
-	BLI_strncpy(name, filename, sizeof(name));
-	BLI_path_abs(name, ref_file_name);
-
-	if (BLI_stat(name, &st) == -1) {
-		ret_val = PF_NOFILE;
-	}
-	else if (st.st_size != pf->size) {
-		ret_val = PF_DIFFERS;
-	}
-	else {
-		/* we'll have to compare the two... */
-
-		file = BLI_open(name, O_BINARY | O_RDONLY, 0);
-		if (file == -1) {
-			ret_val = PF_NOFILE;
-		}
-		else {
-			ret_val = PF_EQUAL;
-
-			for (i = 0; i < pf->size; i += sizeof(buf)) {
-				len = pf->size - i;
-				if (len > sizeof(buf)) {
-					len = sizeof(buf);
-				}
-
-				if (read(file, buf, len) != len) {
-					/* read error ... */
-					ret_val = PF_DIFFERS;
-					break;
-				}
-				else {
-					if (memcmp(buf, ((char *)pf->data) + i, len)) {
-						ret_val = PF_DIFFERS;
-						break;
-					}
-				}
-			}
-
-			close(file);
-		}
-	}
-
-	return(ret_val);
+  BLI_stat_t st;
+  int ret_val, i, len, file;
+  char buf[4096];
+  char name[FILE_MAX];
+
+  BLI_strncpy(name, filename, sizeof(name));
+  BLI_path_abs(name, ref_file_name);
+
+  if (BLI_stat(name, &st) == -1) {
+    ret_val = PF_NOFILE;
+  }
+  else if (st.st_size != pf->size) {
+    ret_val = PF_DIFFERS;
+  }
+  else {
+    /* we'll have to compare the two... */
+
+    file = BLI_open(name, O_BINARY | O_RDONLY, 0);
+    if (file == -1) {
+      ret_val = PF_NOFILE;
+    }
+    else {
+      ret_val = PF_EQUAL;
+
+      for (i = 0; i < pf->size; i += sizeof(buf)) {
+        len = pf->size - i;
+        if (len > sizeof(buf)) {
+          len = sizeof(buf);
+        }
+
+        if (read(file, buf, len) != len) {
+          /* read error ... */
+          ret_val = PF_DIFFERS;
+          break;
+        }
+        else {
+          if (memcmp(buf, ((char *)pf->data) + i, len)) {
+            ret_val = PF_DIFFERS;
+            break;
+          }
+        }
+      }
+
+      close(file);
+    }
+  }
+
+  return (ret_val);
 }
 
 /**
@@ -388,339 +399,347 @@ int checkPackedFile(const char *ref_file_name, const char *filename, PackedFile
  *
  * \warning 'abs_name' may be relative still! (use a "//" prefix) be sure to run #BLI_path_abs on it first.
  */
-char *unpackFile(
-        ReportList *reports, const char *ref_file_name,
-        const char *abs_name, const char *local_name, PackedFile *pf, int how)
+char *unpackFile(ReportList *reports,
+                 const char *ref_file_name,
+                 const char *abs_name,
+                 const char *local_name,
+                 PackedFile *pf,
+                 int how)
 {
-	char *newname = NULL;
-	const char *temp = NULL;
-
-	if (pf != NULL) {
-		switch (how) {
-			case -1:
-			case PF_KEEP:
-				break;
-			case PF_REMOVE:
-				temp = abs_name;
-				break;
-			case PF_USE_LOCAL:
-			{
-				char temp_abs[FILE_MAX];
-
-				BLI_strncpy(temp_abs, local_name, sizeof(temp_abs));
-				BLI_path_abs(temp_abs, ref_file_name);
-
-				/* if file exists use it */
-				if (BLI_exists(temp_abs)) {
-					temp = local_name;
-					break;
-				}
-				/* else create it */
-				ATTR_FALLTHROUGH;
-			}
-			case PF_WRITE_LOCAL:
-				if (writePackedFile(reports, ref_file_name, local_name, pf, 1) == RET_OK) {
-					temp = local_name;
-				}
-				break;
-			case PF_USE_ORIGINAL:
-			{
-				char temp_abs[FILE_MAX];
-
-				BLI_strncpy(temp_abs, abs_name, sizeof(temp_abs));
-				BLI_path_abs(temp_abs, ref_file_name);
-
-				/* if file exists use it */
-				if (BLI_exists(temp_abs)) {
-					BKE_reportf(reports, RPT_INFO, "Use existing file (instead of packed): %s", abs_name);
-					temp = abs_name;
-					break;
-				}
-				/* else create it */
-				ATTR_FALLTHROUGH;
-			}
-			case PF_WRITE_ORIGINAL:
-				if (writePackedFile(reports, ref_file_name, abs_name, pf, 1) == RET_OK) {
-					temp = abs_name;
-				}
-				break;
-			default:
-				printf("unpackFile: unknown return_value %d\n", how);
-				break;
-		}
-
-		if (temp) {
-			newname = BLI_strdup(temp);
-		}
-	}
-
-	return newname;
+  char *newname = NULL;
+  const char *temp = NULL;
+
+  if (pf != NULL) {
+    switch (how) {
+      case -1:
+      case PF_KEEP:
+        break;
+      case PF_REMOVE:
+        temp = abs_name;
+        break;
+      case PF_USE_LOCAL: {
+        char temp_abs[FILE_MAX];
+
+        BLI_strncpy(temp_abs, local_name, sizeof(temp_abs));
+        BLI_path_abs(temp_abs, ref_file_name);
+
+        /* if file exists use it */
+        if (BLI_exists(temp_abs)) {
+          temp = local_name;
+          break;
+        }
+        /* else create it */
+        ATTR_FALLTHROUGH;
+      }
+      case PF_WRITE_LOCAL:
+        if (writePackedFile(reports, ref_file_name, local_name, pf, 1) == RET_OK) {
+          temp = local_name;
+        }
+        break;
+      case PF_USE_ORIGINAL: {
+        char temp_abs[FILE_MAX];
+
+        BLI_strncpy(temp_abs, abs_name, sizeof(temp_abs));
+        BLI_path_abs(temp_abs, ref_file_name);
+
+        /* if file exists use it */
+        if (BLI_exists(temp_abs)) {
+          BKE_reportf(reports, RPT_INFO, "Use existing file (instead of packed): %s", abs_name);
+          temp = abs_name;
+          break;
+        }
+        /* else create it */
+        ATTR_FALLTHROUGH;
+      }
+      case PF_WRITE_ORIGINAL:
+        if (writePackedFile(reports, ref_file_name, abs_name, pf, 1) == RET_OK) {
+          temp = abs_name;
+        }
+        break;
+      default:
+        printf("unpackFile: unknown return_value %d\n", how);
+        break;
+    }
+
+    if (temp) {
+      newname = BLI_strdup(temp);
+    }
+  }
+
+  return newname;
 }
 
-static void unpack_generate_paths(
-        const char *name, ID *id, char *r_abspath, char *r_relpath, size_t abspathlen, size_t relpathlen)
+static void unpack_generate_paths(const char *name,
+                                  ID *id,
+                                  char *r_abspath,
+                                  char *r_relpath,
+                                  size_t abspathlen,
+                                  size_t relpathlen)
 {
-	char tempname[FILE_MAX];
-	char tempdir[FILE_MAXDIR];
-
-	BLI_split_dirfile(name, tempdir, tempname, sizeof(tempdir), sizeof(tempname));
-
-	if (tempname[0] == '\0') {
-		/* Note: we do not have any real way to re-create extension out of data... */
-		BLI_strncpy(tempname, id->name + 2, sizeof(tempname));
-		printf("%s\n", tempname);
-		BLI_filename_make_safe(tempname);
-		printf("%s\n", tempname);
-	}
-
-	if (tempdir[0] == '\0') {
-		/* Fallback to relative dir. */
-		BLI_strncpy(tempdir, "//", sizeof(tempdir));
-	}
-
-	switch (GS(id->name)) {
-		case ID_VF:
-			BLI_snprintf(r_relpath, relpathlen, "//fonts/%s", tempname);
-			break;
-		case ID_SO:
-			BLI_snprintf(r_relpath, relpathlen, "//sounds/%s", tempname);
-			break;
-		case ID_IM:
-			BLI_snprintf(r_relpath, relpathlen, "//textures/%s", tempname);
-			break;
-		default:
-			break;
-	}
-
-	{
-		size_t len = BLI_strncpy_rlen(r_abspath, tempdir, abspathlen);
-		BLI_strncpy(r_abspath + len, tempname, abspathlen - len);
-	}
+  char tempname[FILE_MAX];
+  char tempdir[FILE_MAXDIR];
+
+  BLI_split_dirfile(name, tempdir, tempname, sizeof(tempdir), sizeof(tempname));
+
+  if (tempname[0] == '\0') {
+    /* Note: we do not have any real way to re-create extension out of data... */
+    BLI_strncpy(tempname, id->name + 2, sizeof(tempname));
+    printf("%s\n", tempname);
+    BLI_filename_make_safe(tempname);
+    printf("%s\n", tempname);
+  }
+
+  if (tempdir[0] == '\0') {
+    /* Fallback to relative dir. */
+    BLI_strncpy(tempdir, "//", sizeof(tempdir));
+  }
+
+  switch (GS(id->name)) {
+    case ID_VF:
+      BLI_snprintf(r_relpath, relpathlen, "//fonts/%s", tempname);
+      break;
+    case ID_SO:
+      BLI_snprintf(r_relpath, relpathlen, "//sounds/%s", tempname);
+      break;
+    case ID_IM:
+      BLI_snprintf(r_relpath, relpathlen, "//textures/%s", tempname);
+      break;
+    default:
+      break;
+  }
+
+  {
+    size_t len = BLI_strncpy_rlen(r_abspath, tempdir, abspathlen);
+    BLI_strncpy(r_abspath + len, tempname, abspathlen - len);
+  }
 }
 
 int unpackVFont(Main *bmain, ReportList *reports, VFont *vfont, int how)
 {
-	char localname[FILE_MAX], absname[FILE_MAX];
-	char *newname;
-	int ret_value = RET_ERROR;
-
-	if (vfont != NULL) {
-		unpack_generate_paths(vfont->name, (ID *)vfont, absname, localname, sizeof(absname), sizeof(localname));
-		newname = unpackFile(reports, BKE_main_blendfile_path(bmain), absname, localname, vfont->packedfile, how);
-		if (newname != NULL) {
-			ret_value = RET_OK;
-			freePackedFile(vfont->packedfile);
-			vfont->packedfile = NULL;
-			BLI_strncpy(vfont->name, newname, sizeof(vfont->name));
-			MEM_freeN(newname);
-		}
-	}
-
-	return (ret_value);
+  char localname[FILE_MAX], absname[FILE_MAX];
+  char *newname;
+  int ret_value = RET_ERROR;
+
+  if (vfont != NULL) {
+    unpack_generate_paths(
+        vfont->name, (ID *)vfont, absname, localname, sizeof(absname), sizeof(localname));
+    newname = unpackFile(
+        reports, BKE_main_blendfile_path(bmain), absname, localname, vfont->packedfile, how);
+    if (newname != NULL) {
+      ret_value = RET_OK;
+      freePackedFile(vfont->packedfile);
+      vfont->packedfile = NULL;
+      BLI_strncpy(vfont->name, newname, sizeof(vfont->name));
+      MEM_freeN(newname);
+    }
+  }
+
+  return (ret_value);
 }
 
 int unpackSound(Main *bmain, ReportList *reports, bSound *sound, int how)
 {
-	char localname[FILE_MAX], absname[FILE_MAX];
-	char *newname;
-	int ret_value = RET_ERROR;
+  char localname[FILE_MAX], absname[FILE_MAX];
+  char *newname;
+  int ret_value = RET_ERROR;
 
-	if (sound != NULL) {
-		unpack_generate_paths(sound->name, (ID *)sound, absname, localname, sizeof(absname), sizeof(localname));
-		newname = unpackFile(reports, BKE_main_blendfile_path(bmain), absname, localname, sound->packedfile, how);
-		if (newname != NULL) {
-			BLI_strncpy(sound->name, newname, sizeof(sound->name));
-			MEM_freeN(newname);
+  if (sound != NULL) {
+    unpack_generate_paths(
+        sound->name, (ID *)sound, absname, localname, sizeof(absname), sizeof(localname));
+    newname = unpackFile(
+        reports, BKE_main_blendfile_path(bmain), absname, localname, sound->packedfile, how);
+    if (newname != NULL) {
+      BLI_strncpy(sound->name, newname, sizeof(sound->name));
+      MEM_freeN(newname);
 
-			freePackedFile(sound->packedfile);
-			sound->packedfile = NULL;
+      freePackedFile(sound->packedfile);
+      sound->packedfile = NULL;
 
-			BKE_sound_load(bmain, sound);
+      BKE_sound_load(bmain, sound);
 
-			ret_value = RET_OK;
-		}
-	}
+      ret_value = RET_OK;
+    }
+  }
 
-	return(ret_value);
+  return (ret_value);
 }
 
 int unpackImage(Main *bmain, ReportList *reports, Image *ima, int how)
 {
-	int ret_value = RET_ERROR;
-
-	if (ima != NULL) {
-		while (ima->packedfiles.last) {
-			char localname[FILE_MAX], absname[FILE_MAX];
-			char *newname;
-			ImagePackedFile *imapf = ima->packedfiles.last;
-
-			unpack_generate_paths(imapf->filepath, (ID *)ima, absname, localname, sizeof(absname), sizeof(localname));
-			newname = unpackFile(reports, BKE_main_blendfile_path(bmain), absname, localname, imapf->packedfile, how);
-
-			if (newname != NULL) {
-				ImageView *iv;
-
-				ret_value = ret_value == RET_ERROR ? RET_ERROR : RET_OK;
-				freePackedFile(imapf->packedfile);
-				imapf->packedfile = NULL;
-
-				/* update the new corresponding view filepath */
-				iv = BLI_findstring(&ima->views, imapf->filepath, offsetof(ImageView, filepath));
-				if (iv) {
-					BLI_strncpy(iv->filepath, newname, sizeof(imapf->filepath));
-				}
-
-				/* keep the new name in the image for non-pack specific reasons */
-				if (how != PF_REMOVE) {
-					BLI_strncpy(ima->name, newname, sizeof(imapf->filepath));
-				}
-				MEM_freeN(newname);
-			}
-			else {
-				ret_value = RET_ERROR;
-			}
-
-			BLI_remlink(&ima->packedfiles, imapf);
-			MEM_freeN(imapf);
-		}
-	}
-
-	if (ret_value == RET_OK) {
-		BKE_image_signal(bmain, ima, NULL, IMA_SIGNAL_RELOAD);
-	}
-
-	return(ret_value);
+  int ret_value = RET_ERROR;
+
+  if (ima != NULL) {
+    while (ima->packedfiles.last) {
+      char localname[FILE_MAX], absname[FILE_MAX];
+      char *newname;
+      ImagePackedFile *imapf = ima->packedfiles.last;
+
+      unpack_generate_paths(
+          imapf->filepath, (ID *)ima, absname, localname, sizeof(absname), sizeof(localname));
+      newname = unpackFile(
+          reports, BKE_main_blendfile_path(bmain), absname, localname, imapf->packedfile, how);
+
+      if (newname != NULL) {
+        ImageView *iv;
+
+        ret_value = ret_value == RET_ERROR ? RET_ERROR : RET_OK;
+        freePackedFile(imapf->packedfile);
+        imapf->packedfile = NULL;
+
+        /* update the new corresponding view filepath */
+        iv = BLI_findstring(&ima->views, imapf->filepath, offsetof(ImageView, filepath));
+        if (iv) {
+          BLI_strncpy(iv->filepath, newname, sizeof(imapf->filepath));
+        }
+
+        /* keep the new name in the image for non-pack specific reasons */
+        if (how != PF_REMOVE) {
+          BLI_strncpy(ima->name, newname, sizeof(imapf->filepath));
+        }
+        MEM_freeN(newname);
+      }
+      else {
+        ret_value = RET_ERROR;
+      }
+
+      BLI_remlink(&ima->packedfiles, imapf);
+      MEM_freeN(imapf);
+    }
+  }
+
+  if (ret_value == RET_OK) {
+    BKE_image_signal(bmain, ima, NULL, IMA_SIGNAL_RELOAD);
+  }
+
+  return (ret_value);
 }
 
 int unpackLibraries(Main *bmain, ReportList *reports)
 {
-	Library *lib;
-	char *newname;
-	int ret_value = RET_ERROR;
+  Library *lib;
+  char *newname;
+  int ret_value = RET_ERROR;
 
-	for (lib = bmain->libraries.first; lib; lib = lib->id.next) {
-		if (lib->packedfile && lib->name[0]) {
+  for (lib = bmain->libraries.first; lib; lib = lib->id.next) {
+    if (lib->packedfile && lib->name[0]) {
 
-			newname = unpackFile(reports, BKE_main_blendfile_path(bmain), lib->filepath, lib->filepath, lib->packedfile, PF_WRITE_ORIGINAL);
-			if (newname != NULL) {
-				ret_value = RET_OK;
+      newname = unpackFile(reports,
+                           BKE_main_blendfile_path(bmain),
+                           lib->filepath,
+                           lib->filepath,
+                           lib->packedfile,
+                           PF_WRITE_ORIGINAL);
+      if (newname != NULL) {
+        ret_value = RET_OK;
 
-				printf("Unpacked .blend library: %s\n", newname);
+        printf("Unpacked .blend library: %s\n", newname);
 
-				freePackedFile(lib->packedfile);
-				lib->packedfile = NULL;
+        freePackedFile(lib->packedfile);
+        lib->packedfile = NULL;
 
-				MEM_freeN(newname);
-			}
-		}
-	}
+        MEM_freeN(newname);
+      }
+    }
+  }
 
-	return(ret_value);
+  return (ret_value);
 }
 
 void packLibraries(Main *bmain, ReportList *reports)
 {
-	Library *lib;
+  Library *lib;
 
-	/* test for relativenss */
-	for (lib = bmain->libraries.first; lib; lib = lib->id.next)
-		if (!BLI_path_is_rel(lib->name))
-			break;
+  /* test for relativenss */
+  for (lib = bmain->libraries.first; lib; lib = lib->id.next)
+    if (!BLI_path_is_rel(lib->name))
+      break;
 
-	if (lib) {
-		BKE_reportf(reports, RPT_ERROR, "Cannot pack absolute file: '%s'", lib->name);
-		return;
-	}
+  if (lib) {
+    BKE_reportf(reports, RPT_ERROR, "Cannot pack absolute file: '%s'", lib->name);
+    return;
+  }
 
-	for (lib = bmain->libraries.first; lib; lib = lib->id.next)
-		if (lib->packedfile == NULL)
-			lib->packedfile = newPackedFile(reports, lib->name, BKE_main_blendfile_path(bmain));
+  for (lib = bmain->libraries.first; lib; lib = lib->id.next)
+    if (lib->packedfile == NULL)
+      lib->packedfile = newPackedFile(reports, lib->name, BKE_main_blendfile_path(bmain));
 }
 
 void unpackAll(Main *bmain, ReportList *reports, int how)
 {
-	Image *ima;
-	VFont *vf;
-	bSound *sound;
+  Image *ima;
+  VFont *vf;
+  bSound *sound;
 
-	for (ima = bmain->images.first; ima; ima = ima->id.next)
-		if (BKE_image_has_packedfile(ima))
-			unpackImage(bmain, reports, ima, how);
+  for (ima = bmain->images.first; ima; ima = ima->id.next)
+    if (BKE_image_has_packedfile(ima))
+      unpackImage(bmain, reports, ima, how);
 
-	for (vf = bmain->fonts.first; vf; vf = vf->id.next)
-		if (vf->packedfile)
-			unpackVFont(bmain, reports, vf, how);
+  for (vf = bmain->fonts.first; vf; vf = vf->id.next)
+    if (vf->packedfile)
+      unpackVFont(bmain, reports, vf, how);
 
-	for (sound = bmain->sounds.first; sound; sound = sound->id.next)
-		if (sound->packedfile)
-			unpackSound(bmain, reports, sound, how);
+  for (sound = bmain->sounds.first; sound; sound = sound->id.next)
+    if (sound->packedfile)
+      unpackSound(bmain, reports, sound, how);
 }
 
 /* ID should be not NULL, return 1 if there's a packed file */
 bool BKE_pack_check(ID *id)
 {
-	switch (GS(id->name)) {
-		case ID_IM:
-		{
-			Image *ima = (Image *)id;
-			return BKE_image_has_packedfile(ima);
-		}
-		case ID_VF:
-		{
-			VFont *vf = (VFont *)id;
-			return vf->packedfile != NULL;
-		}
-		case ID_SO:
-		{
-			bSound *snd = (bSound *)id;
-			return snd->packedfile != NULL;
-		}
-		case ID_LI:
-		{
-			Library *li = (Library *)id;
-			return li->packedfile != NULL;
-		}
-		default:
-			break;
-	}
-	return false;
+  switch (GS(id->name)) {
+    case ID_IM: {
+      Image *ima = (Image *)id;
+      return BKE_image_has_packedfile(ima);
+    }
+    case ID_VF: {
+      VFont *vf = (VFont *)id;
+      return vf->packedfile != NULL;
+    }
+    case ID_SO: {
+      bSound *snd = (bSound *)id;
+      return snd->packedfile != NULL;
+    }
+    case ID_LI: {
+      Library *li = (Library *)id;
+      return li->packedfile != NULL;
+    }
+    default:
+      break;
+  }
+  return false;
 }
 
 /* ID should be not NULL */
 void BKE_unpack_id(Main *bmain, ID *id, ReportList *reports, int how)
 {
-	switch (GS(id->name)) {
-		case ID_IM:
-		{
-			Image *ima = (Image *)id;
-			if (BKE_image_has_packedfile(ima)) {
-				unpackImage(bmain, reports, ima, how);
-			}
-			break;
-		}
-		case ID_VF:
-		{
-			VFont *vf = (VFont *)id;
-			if (vf->packedfile) {
-				unpackVFont(bmain, reports, vf, how);
-			}
-			break;
-		}
-		case ID_SO:
-		{
-			bSound *snd = (bSound *)id;
-			if (snd->packedfile) {
-				unpackSound(bmain, reports, snd, how);
-			}
-			break;
-		}
-		case ID_LI:
-		{
-			Library *li = (Library *)id;
-			BKE_reportf(reports, RPT_ERROR, "Cannot unpack individual Library file, '%s'", li->name);
-			break;
-		}
-		default:
-			break;
-	}
+  switch (GS(id->name)) {
+    case ID_IM: {
+      Image *ima = (Image *)id;
+      if (BKE_image_has_packedfile(ima)) {
+        unpackImage(bmain, reports, ima, how);
+      }
+      break;
+    }
+    case ID_VF: {
+      VFont *vf = (VFont *)id;
+      if (vf->packedfile) {
+        unpackVFont(bmain, reports, vf, how);
+      }
+      break;
+    }
+    case ID_SO: {
+      bSound *snd = (bSound *)id;
+      if (snd->packedfile) {
+        unpackSound(bmain, reports, snd, how);
+      }
+      break;
+    }
+    case ID_LI: {
+      Library *li = (Library *)id;
+      BKE_reportf(reports, RPT_ERROR, "Cannot unpack individual Library file, '%s'", li->name);
+      break;
+    }
+    default:
+      break;
+  }
 }