1 files changed, 9 insertions, 12 deletions

diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index 276977a..d9318ed 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -124,12 +124,18 @@ int eyefiService::UploadPhoto(
     syslog(LOG_DEBUG,
             "UploadPhoto request from %s with fileid=%d, filename=%s, filesize=%ld,"
             " filesignature=%s, encryption=%s, flags=%04X",
             macaddress.c_str(), fileid, filename.c_str(), filesize,
             filesignature.c_str(), encryption.c_str(), flags );
 #endif
+    std::string::size_type fnl=filename.length();
+    if(fnl<sizeof(".tar") || strncmp(filename.c_str()+fnl-sizeof(".tar")+sizeof(""),".tar",sizeof(".tar")))
+        throw std::runtime_error(gnu::autosprintf("honestly, I expected the tarball coming here, not '%s'",filename.c_str()));
+    std::string the_file(filename,0,fnl-sizeof(".tar")+sizeof(""));
+    std::string the_log = the_file+".log";
+
     eyekinfig_t eyekinfig(macaddress);
 
     umask(eyekinfig.get_umask());
 
     std::string td = eyekinfig.get_targetdir();
     tmpdir_t indir(td+"/.incoming.XXXXXX");
@@ -166,24 +172,15 @@ int eyefiService::UploadPhoto(
 #ifndef NDEBUG
             syslog(LOG_DEBUG," computed integrity digest=%s", digest.hex().c_str());
 #endif
 
             tarchive_t a((*i).ptr,(*i).size);
             while(a.read_next_header()) {
-                std::string f = indir.get_file(a.entry_pathname());
-                std::string::size_type fl = f.length();
-                if(fl<4) continue;
-                const char *s = f.c_str()+fl-4;
-                static const char *suffixes[] = { ".JPG",".AVI",".MP4",".NEF",".RAW",".TIF",".DNG",".CRW",
-                    ".RW2",".CR2" };
-                if(std::find_if(suffixes,suffixes+sizeof(suffixes)/sizeof(*suffixes),
-                            std::not1(std::bind1st(std::ptr_fun(strcasecmp),s)))
-                        != suffixes+sizeof(suffixes)/sizeof(*suffixes))
-                    tf = f;
-                else if(!strcasecmp(s,".log"))
-                    lf = f;
+                std::string ep = a.entry_pathname(), f = indir.get_file(ep);
+                if(ep==the_file) tf = f;
+                else if(ep==the_log) lf = f;
                 else continue;
                 int fd=open(f.c_str(),O_CREAT|O_WRONLY,0666);
                 if(fd<0)
                     throw std::runtime_error(gnu::autosprintf("failed to create output file '%s'",f.c_str()));
                 if(!a.read_data_into_fd(fd))
                     throw std::runtime_error(gnu::autosprintf("failed to untar file into '%s'",f.c_str()));