Shorten compile commands run by the build system

[tools/e2fsprogs.git] / lib / ext2fs / link.c

diff --git a/lib/ext2fs/link.c b/lib/ext2fs/link.c
index b1a1572..2d03b57 100644 (file)
--- a/lib/ext2fs/link.c
+++ b/lib/ext2fs/link.c
@@ -1,35 +1,35 @@
 /*
  * link.c --- create links in a ext2fs directory
- * 
+ *
  * Copyright (C) 1993, 1994 Theodore Ts'o.
  *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the GNU Library
+ * General Public License, version 2.
  * %End-Header%
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
-#if EXT2_FLAT_INCLUDES
 #include "ext2_fs.h"
-#else
-#include <linux/ext2_fs.h>
-#endif
-
 #include "ext2fs.h"
 
 struct link_struct  {
+       ext2_filsys     fs;
        const char      *name;
        int             namelen;
-       ino_t           inode;
+       ext2_ino_t      inode;
        int             flags;
        int             done;
-};     
+       unsigned int    blocksize;
+       errcode_t       err;
+       struct ext2_super_block *sb;
+};
 
 static int link_proc(struct ext2_dir_entry *dirent,
                     int        offset,
@@ -39,20 +39,27 @@ static int link_proc(struct ext2_dir_entry *dirent,
 {
        struct link_struct *ls = (struct link_struct *) priv_data;
        struct ext2_dir_entry *next;
-       int rec_len;
+       unsigned int rec_len, min_rec_len, curr_rec_len;
        int ret = 0;
 
        rec_len = EXT2_DIR_REC_LEN(ls->namelen);
 
+       ls->err = ext2fs_get_rec_len(ls->fs, dirent, &curr_rec_len);
+       if (ls->err)
+               return DIRENT_ABORT;
+
        /*
         * See if the following directory entry (if any) is unused;
         * if so, absorb it into this one.
         */
-       next = (struct ext2_dir_entry *) (buf + offset + dirent->rec_len);
-       if ((offset + dirent->rec_len < blocksize - 8) &&
+       next = (struct ext2_dir_entry *) (buf + offset + curr_rec_len);
+       if ((offset + (int) curr_rec_len < blocksize - 8) &&
            (next->inode == 0) &&
-           (offset + dirent->rec_len + next->rec_len <= blocksize)) {
-               dirent->rec_len += next->rec_len;
+           (offset + (int) curr_rec_len + (int) next->rec_len <= blocksize)) {
+               curr_rec_len += next->rec_len;
+               ls->err = ext2fs_set_rec_len(ls->fs, curr_rec_len, dirent);
+               if (ls->err)
+                       return DIRENT_ABORT;
                ret = DIRENT_CHANGED;
        }
 
@@ -62,16 +69,20 @@ static int link_proc(struct ext2_dir_entry *dirent,
         * truncate it and return.
         */
        if (dirent->inode) {
-               if (dirent->rec_len < (EXT2_DIR_REC_LEN(dirent->name_len) +
-                                      rec_len))
+               min_rec_len = EXT2_DIR_REC_LEN(dirent->name_len & 0xFF);
+               if (curr_rec_len < (min_rec_len + rec_len))
                        return ret;
-               rec_len = dirent->rec_len - EXT2_DIR_REC_LEN(dirent->name_len);
-               dirent->rec_len = EXT2_DIR_REC_LEN(dirent->name_len);
+               rec_len = curr_rec_len - min_rec_len;
+               ls->err = ext2fs_set_rec_len(ls->fs, min_rec_len, dirent);
+               if (ls->err)
+                       return DIRENT_ABORT;
                next = (struct ext2_dir_entry *) (buf + offset +
                                                  dirent->rec_len);
                next->inode = 0;
                next->name_len = 0;
-               next->rec_len = rec_len;
+               ls->err = ext2fs_set_rec_len(ls->fs, rec_len, next);
+               if (ls->err)
+                       return DIRENT_ABORT;
                return DIRENT_CHANGED;
        }
 
@@ -79,40 +90,65 @@ static int link_proc(struct ext2_dir_entry *dirent,
         * If we get this far, then the directory entry is not used.
         * See if we can fit the request entry in.  If so, do it.
         */
-       if (dirent->rec_len < rec_len)
+       if (curr_rec_len < rec_len)
                return ret;
        dirent->inode = ls->inode;
        dirent->name_len = ls->namelen;
        strncpy(dirent->name, ls->name, ls->namelen);
+       if (ls->sb->s_feature_incompat & EXT2_FEATURE_INCOMPAT_FILETYPE)
+               dirent->name_len |= (ls->flags & 0x7) << 8;
 
        ls->done++;
        return DIRENT_ABORT|DIRENT_CHANGED;
 }
 
+/*
+ * Note: the low 3 bits of the flags field are used as the directory
+ * entry filetype.
+ */
 #ifdef __TURBOC__
-#pragma argsused
+ #pragma argsused
 #endif
-errcode_t ext2fs_link(ext2_filsys fs, ino_t dir, const char *name, ino_t ino,
-                     int flags)
+errcode_t ext2fs_link(ext2_filsys fs, ext2_ino_t dir, const char *name,
+                     ext2_ino_t ino, int flags)
 {
-       errcode_t       retval;
-       struct link_struct ls;
+       errcode_t               retval;
+       struct link_struct      ls;
+       struct ext2_inode       inode;
 
        EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
 
        if (!(fs->flags & EXT2_FLAG_RW))
                return EXT2_ET_RO_FILSYS;
 
+       ls.fs = fs;
        ls.name = name;
        ls.namelen = name ? strlen(name) : 0;
        ls.inode = ino;
-       ls.flags = 0;
+       ls.flags = flags;
        ls.done = 0;
+       ls.sb = fs->super;
+       ls.blocksize = fs->blocksize;
+       ls.err = 0;
 
        retval = ext2fs_dir_iterate(fs, dir, DIRENT_FLAG_INCLUDE_EMPTY,
                                    0, link_proc, &ls);
        if (retval)
                return retval;
+       if (ls.err)
+               return ls.err;
+
+       if (!ls.done)
+               return EXT2_ET_DIR_NO_SPACE;
+
+       if ((retval = ext2fs_read_inode(fs, dir, &inode)) != 0)
+               return retval;
+
+       if (inode.i_flags & EXT2_INDEX_FL) {
+               inode.i_flags &= ~EXT2_INDEX_FL;
+               if ((retval = ext2fs_write_inode(fs, dir, &inode)) != 0)
+                       return retval;
+       }
 
-       return (ls.done) ? 0 : EXT2_ET_DIR_NO_SPACE;
+       return 0;
 }