X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Ffs_misc.c;h=89dc48683ad9aded3ca00f02dfbd6a805c2303fe;hb=0238d7e2f30821e7b94e9ea25ce3918fcc04b2c3;hp=9fa86a5c4692d2bb6ca909fbf4e16746acf98c30;hpb=502af2167f7c218366666ca4944bd7cc54b5b19a;p=oweals%2Fgnunet.git

diff --git a/src/fs/fs_misc.c b/src/fs/fs_misc.c
index 9fa86a5c4..89dc48683 100644
--- a/src/fs/fs_misc.c
+++ b/src/fs/fs_misc.c
@@ -25,12 +25,12 @@
 #include "platform.h"
 #include "gnunet_constants.h"
 #include "gnunet_fs_service.h"
-#include "fs.h"
+#include "fs_api.h"
 
 
 /**
  * Suggest a filename based on given metadata.
- * 
+ *
  * @param md given meta data
  * @return NULL if meta data is useless for suggesting a filename
  */
@@ -108,44 +108,45 @@ GNUNET_FS_meta_data_suggest_filename (const struct GNUNET_CONTAINER_MetaData
   char *base;
   const char *ext;
 
-  ret = GNUNET_CONTAINER_meta_data_get_by_type (md,
-                                                EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME);
+  ret =
+      GNUNET_CONTAINER_meta_data_get_by_type (md,
+                                              EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME);
   if (ret != NULL)
     return ret;
   ext = NULL;
-  mime = GNUNET_CONTAINER_meta_data_get_by_type (md,
-                                                 EXTRACTOR_METATYPE_MIMETYPE);
+  mime =
+      GNUNET_CONTAINER_meta_data_get_by_type (md, EXTRACTOR_METATYPE_MIMETYPE);
   if (mime != NULL)
   {
     i = 0;
     while ((mimeMap[i][0] != NULL) && (0 != strcmp (mime, mimeMap[i][0])))
       i++;
     if (mimeMap[i][1] == NULL)
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG |
-                  GNUNET_ERROR_TYPE_BULK,
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
                   _("Did not find mime type `%s' in extension list.\n"), mime);
     else
       ext = mimeMap[i][1];
     GNUNET_free (mime);
   }
-  base = GNUNET_CONTAINER_meta_data_get_first_by_types (md,
-                                                        EXTRACTOR_METATYPE_TITLE,
-                                                        EXTRACTOR_METATYPE_BOOK_TITLE,
-                                                        EXTRACTOR_METATYPE_ORIGINAL_TITLE,
-                                                        EXTRACTOR_METATYPE_PACKAGE_NAME,
-                                                        EXTRACTOR_METATYPE_URL,
-                                                        EXTRACTOR_METATYPE_URI,
-                                                        EXTRACTOR_METATYPE_DESCRIPTION,
-                                                        EXTRACTOR_METATYPE_ISRC,
-                                                        EXTRACTOR_METATYPE_JOURNAL_NAME,
-                                                        EXTRACTOR_METATYPE_AUTHOR_NAME,
-                                                        EXTRACTOR_METATYPE_SUBJECT,
-                                                        EXTRACTOR_METATYPE_ALBUM,
-                                                        EXTRACTOR_METATYPE_ARTIST,
-                                                        EXTRACTOR_METATYPE_KEYWORDS,
-                                                        EXTRACTOR_METATYPE_COMMENT,
-                                                        EXTRACTOR_METATYPE_UNKNOWN,
-                                                        -1);
+  base =
+      GNUNET_CONTAINER_meta_data_get_first_by_types (md,
+                                                     EXTRACTOR_METATYPE_TITLE,
+                                                     EXTRACTOR_METATYPE_BOOK_TITLE,
+                                                     EXTRACTOR_METATYPE_ORIGINAL_TITLE,
+                                                     EXTRACTOR_METATYPE_PACKAGE_NAME,
+                                                     EXTRACTOR_METATYPE_URL,
+                                                     EXTRACTOR_METATYPE_URI,
+                                                     EXTRACTOR_METATYPE_DESCRIPTION,
+                                                     EXTRACTOR_METATYPE_ISRC,
+                                                     EXTRACTOR_METATYPE_JOURNAL_NAME,
+                                                     EXTRACTOR_METATYPE_AUTHOR_NAME,
+                                                     EXTRACTOR_METATYPE_SUBJECT,
+                                                     EXTRACTOR_METATYPE_ALBUM,
+                                                     EXTRACTOR_METATYPE_ARTIST,
+                                                     EXTRACTOR_METATYPE_KEYWORDS,
+                                                     EXTRACTOR_METATYPE_COMMENT,
+                                                     EXTRACTOR_METATYPE_UNKNOWN,
+                                                     -1);
   if ((base == NULL) && (ext == NULL))
     return NULL;
   if (base == NULL)
@@ -206,6 +207,25 @@ GNUNET_FS_year_to_time (unsigned int year)
 }
 
 
+/**
+ * Convert an expiration time to the respective year (rounds)
+ *
+ * @param at absolute time 
+ * @return year a year (after 1970), 0 on error
+ */
+unsigned int 
+GNUNET_FS_time_to_year (struct GNUNET_TIME_Absolute at)
+{
+  struct tm *t;
+  time_t tp;
+
+  tp = at.abs_value / 1000;    /* ms to seconds */
+  t = gmtime (&tp);
+  if (t == NULL)
+    return 0;
+  return t->tm_year + 1900;
+
+}
 
 
 /* end of fs_misc.c */